Java Mailing List Archive

http://www.gg3721.com/

Home » Hibernate Commits List »

[hibernate-commits] Hibernate SVN: r14928 - in
 search/trunk/src/java/org/hibernate/search: annotations and 9
 other directories.

hibernate-commits

2008-07-15


Author LoginPost Reply
Author: navssurtani
Date: 2008-07-15 04:47:20 -0400 (Tue, 15 Jul 2008)
New Revision: 14928

Added:
 search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java
 search/trunk/src/java/org/hibernate/search/cfg/
 search/trunk/src/java/org/hibernate/search/cfg/SearchConfiguration.java
 search/trunk/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java
 search/trunk/src/java/org/hibernate/search/transaction/
 search/trunk/src/java/org/hibernate/search/transaction/EventSourceTransactionContext.java
 search/trunk/src/java/org/hibernate/search/transaction/TransactionContext.java
Modified:
 search/trunk/src/java/org/hibernate/search/backend/Worker.java
 search/trunk/src/java/org/hibernate/search/backend/WorkerFactory.java
 search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java
 search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
 search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
 search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
 search/trunk/src/java/org/hibernate/search/impl/InitContext.java
 search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
 search/trunk/src/java/org/hibernate/search/reader/ReaderProviderFactory.java
 search/trunk/src/java/org/hibernate/search/store/DirectoryProviderFactory.java
Log:
Wrote up and implemented changes for the JBoss Cache integration project.

Added: search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java                  (rev 0)
+++ search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java  2008-07-15 08:47:20 UTC (rev 14928)
@@(protected) @@
+package org.hibernate.search.annotations;
+
+import org.hibernate.search.bridge.StringBridge;
+
+import java.lang.annotation.*;
+
+/**
+ * This annotation means that document ids will be generated externally and does not need to be
+ * contained within the class being indexed.
+ * <p />
+ * Basically, this means that classes annotated with this will NOT be scanned for {@(protected).
+ * @author Navin Surtani - navin@(protected)
+ */
+@(protected) )
+@(protected) )
+@(protected)
+public @interface ProvidedId
+{
+
+  String name() default "ProvidedId";
+  Class<StringBridge> bridge() default StringBridge.class;
+}

Modified: search/trunk/src/java/org/hibernate/search/backend/Worker.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/Worker.java  2008-07-14 16:11:15 UTC (rev 14927)
+++ search/trunk/src/java/org/hibernate/search/backend/Worker.java  2008-07-15 08:47:20 UTC (rev 14928)
@@(protected) @@

import org.hibernate.event.EventSource;
import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.hibernate.search.transaction.TransactionContext;

/**
* Perform work for a given session. This implementation has to be multi threaded
@@(protected) @@
public interface Worker {
 //Use of EventSource since it's the common subinterface for Session and SessionImplementor
 //the alternative would have been to do a subcasting or to retrieve 2 parameters :(
-  void performWork(Work work, EventSource session);
+  void performWork(Work work, TransactionContext transactionContext);

 void initialize(Properties props, SearchFactoryImplementor searchFactoryImplementor);

@@(protected) @@
 /**
  * flush any work queue
  */
-  void flushWorks(EventSource session);
+  void flushWorks(TransactionContext transactionContext);
}

Modified: search/trunk/src/java/org/hibernate/search/backend/WorkerFactory.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/WorkerFactory.java  2008-07-14 16:11:15 UTC (rev 14927)
+++ search/trunk/src/java/org/hibernate/search/backend/WorkerFactory.java  2008-07-15 08:47:20 UTC (rev 14928)
@@(protected) @@
import java.util.Map;
import java.util.Properties;

-import org.hibernate.cfg.Configuration;
import org.hibernate.search.Environment;
import org.hibernate.search.SearchException;
+import org.hibernate.search.cfg.SearchConfiguration;
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.backend.impl.TransactionalWorker;
import org.hibernate.util.ReflectHelper;
@@(protected) @@
/**
* @author Emmanuel Bernard
*/
-public abstract class WorkerFactory {
+public abstract class WorkerFactory
+{

-  private static Properties getProperties(Configuration cfg) {
-    Properties props = cfg.getProperties();
-    Properties workerProperties = new Properties();
-    for ( Map.Entry entry : props.entrySet() ) {
-      String key = (String) entry.getKey();
-      if ( key.startsWith( Environment.WORKER_PREFIX ) ) {
-        //key.substring( Environment.WORKER_PREFIX.length() )
-        workerProperties.setProperty( key, (String) entry.getValue() );
-      }
-    }
-    return workerProperties;
-  }
+  private static Properties getProperties(SearchConfiguration cfg)
+  {
+    Properties props = cfg.getProperties();
+    Properties workerProperties = new Properties();
+    for (Map.Entry entry : props.entrySet())
+    {
+      String key = (String) entry.getKey();
+      if (key.startsWith(Environment.WORKER_PREFIX))
+      {
+        //key.substring( Environment.WORKER_PREFIX.length() )
+        workerProperties.setProperty(key, (String) entry.getValue());
+      }
+    }
+    return workerProperties;
+  }

-  public static Worker createWorker(Configuration cfg, SearchFactoryImplementor searchFactoryImplementor) {
-    Properties props = getProperties( cfg );
-    String impl = props.getProperty( Environment.WORKER_SCOPE );
-    Worker worker;
-    if ( StringHelper.isEmpty( impl ) ) {
-      worker = new TransactionalWorker();
-    }
-    else if ( "transaction".equalsIgnoreCase( impl ) ) {
-      worker = new TransactionalWorker();
-    }
-    else {
-      try {
-        Class workerClass = ReflectHelper.classForName( impl, WorkerFactory.class );
-        worker = (Worker) workerClass.newInstance();
-      }
-      catch (ClassNotFoundException e) {
-        throw new SearchException("Unable to find worker class: " + impl, e );
-      }
-      catch (IllegalAccessException e) {
-        throw new SearchException("Unable to instanciate worker class: " + impl, e );
-      }
-      catch (InstantiationException e) {
-        throw new SearchException("Unable to instanciate worker class: " + impl, e );
-      }
-    }
-    worker.initialize( props, searchFactoryImplementor );
-    return worker;
-  }
+  public static Worker createWorker(SearchConfiguration cfg, SearchFactoryImplementor searchFactoryImplementor)
+  {
+    Properties props = getProperties(cfg);
+    String impl = props.getProperty(Environment.WORKER_SCOPE);
+    Worker worker;
+    if (StringHelper.isEmpty(impl))
+    {
+      worker = new TransactionalWorker();
+    }
+    else if ("transaction".equalsIgnoreCase(impl))
+    {
+      worker = new TransactionalWorker();
+    }
+    else
+    {
+      try
+      {
+        Class workerClass = ReflectHelper.classForName(impl, WorkerFactory.class);
+        worker = (Worker) workerClass.newInstance();
+      }
+      catch (ClassNotFoundException e)
+      {
+        throw new SearchException("Unable to find worker class: " + impl, e);
+      }
+      catch (IllegalAccessException e)
+      {
+        throw new SearchException("Unable to instanciate worker class: " + impl, e);
+      }
+      catch (InstantiationException e)
+      {
+        throw new SearchException("Unable to instanciate worker class: " + impl, e);
+      }
+    }
+    worker.initialize(props, searchFactoryImplementor);
+    return worker;
+  }
}

Modified: search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java  2008-07-14 16:11:15 UTC (rev 14927)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/TransactionalWorker.java  2008-07-15 08:47:20 UTC (rev 14928)
@@(protected) @@
//$Id$
package org.hibernate.search.backend.impl;

-import java.util.Properties;
-
-import org.hibernate.Transaction;
-import org.hibernate.event.EventSource;
import org.hibernate.search.backend.QueueingProcessor;
import org.hibernate.search.backend.Work;
import org.hibernate.search.backend.WorkQueue;
import org.hibernate.search.backend.Worker;
import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.hibernate.search.transaction.TransactionContext;
import org.hibernate.search.util.WeakIdentityHashMap;

+import javax.transaction.Transaction;
+import java.util.Properties;
+
/**
* Queue works per transaction.
* If out of transaction, the work is executed right away
- *
+ * <p/>
* When <code>hibernate.search.worker.type</code> is set to <code>async</code>
- * the work is done in a separate thread (threads are pooled)
+ * the work is done in a separate thread (threads are pooled)
*
* @author Emmanuel Bernard
*/
-public class TransactionalWorker implements Worker {
-  //not a synchronized map since for a given transaction, we have not concurrent access
-  protected final WeakIdentityHashMap synchronizationPerTransaction = new WeakIdentityHashMap();
-  private QueueingProcessor queueingProcessor;
+public class TransactionalWorker implements Worker
+{
+  //not a synchronized map since for a given transaction, we have not concurrent access
+  protected final WeakIdentityHashMap synchronizationPerTransaction = new WeakIdentityHashMap();
+  private QueueingProcessor queueingProcessor;

-  public void performWork(Work work, EventSource session) {
-    if ( session.isTransactionInProgress() ) {
-      Transaction transaction = session.getTransaction();
-      PostTransactionWorkQueueSynchronization txSync = (PostTransactionWorkQueueSynchronization)
-          synchronizationPerTransaction.get( transaction );
-      if ( txSync == null || txSync.isConsumed() ) {
-        txSync = new PostTransactionWorkQueueSynchronization( queueingProcessor, synchronizationPerTransaction );
-        transaction.registerSynchronization( txSync );
-        synchronizationPerTransaction.put(transaction, txSync);
-      }
-      txSync.add( work );
-    }
-    else {
-      WorkQueue queue = new WorkQueue(2); //one work can be split
-      queueingProcessor.add( work, queue );
-      queueingProcessor.prepareWorks( queue );
-      queueingProcessor.performWorks( queue );
-    }
-  }
+  public void performWork(Work work, TransactionContext transactionContext)
+  {
+    if (transactionContext.isTxInProgress())
+    {
+      Object transaction = transactionContext.getTransactionIdentifier();
+      PostTransactionWorkQueueSynchronization txSync = (PostTransactionWorkQueueSynchronization)
+           synchronizationPerTransaction.get(transaction);
+      if (txSync == null || txSync.isConsumed())
+      {
+        txSync = new PostTransactionWorkQueueSynchronization(queueingProcessor, synchronizationPerTransaction);
+        transactionContext.registerSynchronization(txSync);
+        synchronizationPerTransaction.put(transaction, txSync);
+      }
+      txSync.add(work);
+    }
+    else
+    {
+      WorkQueue queue = new WorkQueue(2); //one work can be split
+      queueingProcessor.add(work, queue);
+      queueingProcessor.prepareWorks(queue);
+      queueingProcessor.performWorks(queue);
+    }
+  }

-  public void initialize(Properties props, SearchFactoryImplementor searchFactory) {
-    this.queueingProcessor = new BatchedQueueingProcessor( searchFactory, props );
-  }
+  public void initialize(Properties props, SearchFactoryImplementor searchFactory)
+  {
+    this.queueingProcessor = new BatchedQueueingProcessor(searchFactory, props);
+  }

-  public void close() {
-    queueingProcessor.close();
-  }
+  public void close()
+  {
+    queueingProcessor.close();
+  }

-  public void flushWorks(EventSource session) {
-    if ( session.isTransactionInProgress() ) {
-      Transaction transaction = session.getTransaction();
+
+
+
+  public void flushWorks(TransactionContext transactionContext) {
+    if ( transactionContext.isTxInProgress() ) {
+      Object transaction = transactionContext.getTransactionIdentifier();
     PostTransactionWorkQueueSynchronization txSync = (PostTransactionWorkQueueSynchronization)
         synchronizationPerTransaction.get( transaction );
     if ( txSync != null && ! txSync.isConsumed() ) {

Added: search/trunk/src/java/org/hibernate/search/cfg/SearchConfiguration.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/cfg/SearchConfiguration.java                  (rev 0)
+++ search/trunk/src/java/org/hibernate/search/cfg/SearchConfiguration.java  2008-07-15 08:47:20 UTC (rev 14928)
@@(protected) @@
+package org.hibernate.search.cfg;
+
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+
+/**
+ * Provides configuration to Hibernate Search
+ *
+ * @author Navin Surtani - navin@(protected)
+ */
+public interface SearchConfiguration {
+  /**
+   * Returns an iterator over the list of indexed classes
+   *
+   * @return iterator of indexed classes.
+   */
+
+  Iterator<Class> getClassMappings();
+
+  /**
+   * Returns a {@(protected).
+   * TODO: should it be Iteratable
+   * @param name
+   * @return java.lang.Class
+   */
+
+  Class getClassMapping(String name);
+
+  /**
+   * Gets a configuration property from its name
+   * or null if not present
+   *
+   * @param propertyName - as a String.
+   * @return the property as a String
+   */
+
+  String getProperty(String propertyName);
+
+  /**
+   * Gets properties as a java.util.Properties object.
+   *
+   * @return a java.util.Properties object.
+   * @see java.util.Properties object
+   */
+  Properties getProperties();
+
+  /**
+   * Returns a reflection manager if already available in the environment
+   * null otherwise
+   * @return ReflectionManager
+   */
+  ReflectionManager getReflectionManager();
+
+
+}

Added: search/trunk/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java                  (rev 0)
+++ search/trunk/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java  2008-07-15 08:47:20 UTC (rev 14928)
@@(protected) @@
+package org.hibernate.search.cfg;
+
+import java.util.Properties;
+import java.util.Iterator;
+
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
+import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
+
+/**
+ * Search configuration implementation wrapping an Hibernate Core configuration
+ *
+ * @author Emmanuel Bernard
+ */
+public class SearchConfigurationFromHibernateCore implements SearchConfiguration
+{
+  private org.hibernate.cfg.Configuration cfg;
+  private ReflectionManager reflectionManager;
+
+  public SearchConfigurationFromHibernateCore(org.hibernate.cfg.Configuration cfg)
+  {
+    if (cfg == null) throw new NullPointerException("Configuration is null");
+    this.cfg = cfg;
+  }
+
+  public Iterator<Class> getClassMappings()
+  {
+    return new ClassIterator(cfg.getClassMappings());
+  }
+
+  public Class getClassMapping(String name)
+  {
+    return cfg.getClassMapping(name).getMappedClass();
+  }
+
+  public String getProperty(String propertyName)
+  {
+    return cfg.getProperty(propertyName);
+  }
+
+  public Properties getProperties()
+  {
+    return cfg.getProperties();
+  }
+
+  public ReflectionManager getReflectionManager()
+  {
+    if (reflectionManager == null)
+    {
+      try
+      {
+        //TODO introduce a ReflectionManagerHolder interface to avoid reflection
+        //I want to avoid hard link between HAN and Validator for such a simple need
+        //reuse the existing reflectionManager one when possible
+        reflectionManager =
+             (ReflectionManager) cfg.getClass().getMethod("getReflectionManager").invoke(cfg);
+
+      }
+      catch (Exception e)
+      {
+        reflectionManager = new JavaReflectionManager();
+      }
+    }
+    return reflectionManager;
+  }
+
+  private class ClassIterator implements Iterator<Class>
+  {
+    private Iterator hibernatePersistentClassIterator;
+
+    private ClassIterator(Iterator hibernatePersistentClassIterator)
+    {
+      this.hibernatePersistentClassIterator = hibernatePersistentClassIterator;
+    }
+
+    public boolean hasNext()
+    {
+      return hibernatePersistentClassIterator.hasNext();
+    }
+
+    public Class next()
+    {
+      PersistentClass pc = (PersistentClass) hibernatePersistentClassIterator.next();
+      return pc.getMappedClass();
+    }
+
+    public void remove()
+    {
+      hibernatePersistentClassIterator.remove();
+    }
+  }
+}

Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java  2008-07-14 16:11:15 UTC (rev 14927)
+++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java  2008-07-15 08:47:20 UTC (rev 14928)
@@(protected) @@
import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.search.SearchException;
-import org.hibernate.search.annotations.AnalyzerDef;
-import org.hibernate.search.annotations.AnalyzerDefs;
-import org.hibernate.search.annotations.Boost;
-import org.hibernate.search.annotations.ClassBridge;
-import org.hibernate.search.annotations.ClassBridges;
-import org.hibernate.search.annotations.ContainedIn;
-import org.hibernate.search.annotations.DocumentId;
-import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.IndexedEmbedded;
-import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.TermVector;
+import org.hibernate.search.annotations.*;
import org.hibernate.search.backend.AddLuceneWork;
import org.hibernate.search.backend.DeleteLuceneWork;
import org.hibernate.search.backend.LuceneWork;
@@(protected) @@
import org.hibernate.search.bridge.LuceneOptions;
import org.hibernate.search.bridge.TwoWayFieldBridge;
import org.hibernate.search.bridge.TwoWayString2FieldBridgeAdaptor;
+import org.hibernate.search.bridge.builtin.StringBridge;
import org.hibernate.search.impl.InitContext;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.store.IndexShardingStrategy;
@@(protected) @@
* @author Hardy Ferentschik
*/
@SuppressWarnings("unchecked")
-public class DocumentBuilder<T> {
-  private static final Logger log = LoggerFactory.getLogger( DocumentBuilder.class );
+public class DocumentBuilder<T>
+{
+  private static final Logger log = LoggerFactory.getLogger(DocumentBuilder.class);

-  private final PropertiesMetadata rootPropertiesMetadata = new PropertiesMetadata();
-  private final XClass beanClass;
-  private final DirectoryProvider[] directoryProviders;
-  private final IndexShardingStrategy shardingStrategy;
-  private String idKeywordName;
-  private XMember idGetter;
-  private Float idBoost;
-  public static final String CLASS_FIELDNAME = "_hibernate_class";
-  private TwoWayFieldBridge idBridge;
-  private Set<Class> mappedSubclasses = new HashSet<Class>();
-  private ReflectionManager reflectionManager;
-  private int level = 0;
-  private int maxLevel = Integer.MAX_VALUE;
-  private final ScopedAnalyzer analyzer = new ScopedAnalyzer();
-  private Similarity similarity;
-  private boolean isRoot;
-  //if composite id, use of (a, b) in ((1,2), (3,4)) fails on most database
-  private boolean safeFromTupleId;
+  private final PropertiesMetadata rootPropertiesMetadata = new PropertiesMetadata();
+  private final XClass beanClass;
+  private final DirectoryProvider[] directoryProviders;
+  private final IndexShardingStrategy shardingStrategy;
+  private String idKeywordName;
+  private XMember idGetter;
+  private Float idBoost;
+  public static final String CLASS_FIELDNAME = "_hibernate_class";
+  private TwoWayFieldBridge idBridge;
+  private Set<Class> mappedSubclasses = new HashSet<Class>();
+  private ReflectionManager reflectionManager;
+  private int level = 0;
+  private int maxLevel = Integer.MAX_VALUE;
+  private final ScopedAnalyzer analyzer = new ScopedAnalyzer();
+  private Similarity similarity;
+  private boolean isRoot;
+  //if composite id, use of (a, b) in ((1,2), (3,4)) fails on most database
+  private boolean safeFromTupleId;
+  private boolean idProvided = false;

-  public boolean isRoot() {
-    return isRoot;
-  }

-  public DocumentBuilder(XClass clazz, InitContext context, DirectoryProvider[] directoryProviders,
-              IndexShardingStrategy shardingStrategy, ReflectionManager reflectionManager) {
-    this.beanClass = clazz;
-    this.directoryProviders = directoryProviders;
-    this.shardingStrategy = shardingStrategy;
-    //FIXME get rid of it when boost is stored?
-    this.reflectionManager = reflectionManager;
-    this.similarity = context.getDefaultSimilarity();
+  public boolean isRoot()
+  {
+    return isRoot;
+  }

-    if ( clazz == null ) throw new AssertionFailure( "Unable to build a DocumentBuilder with a null class" );
-    rootPropertiesMetadata.boost = getBoost( clazz );
-    rootPropertiesMetadata.analyzer = context.getDefaultAnalyzer();
-    Set<XClass> processedClasses = new HashSet<XClass>();
-    processedClasses.add( clazz );
-    initializeMembers( clazz, rootPropertiesMetadata, true, "", processedClasses, context );
-    //processedClasses.remove( clazz ); for the sake of completness
-    this.analyzer.setGlobalAnalyzer( rootPropertiesMetadata.analyzer );
-    if ( idKeywordName == null ) {
-      throw new SearchException( "No document id in: " + clazz.getName() );
-    }
-    //if composite id, use of (a, b) in ((1,2)TwoWayString2FieldBridgeAdaptor, (3,4)) fails on most database
-    //a TwoWayString2FieldBridgeAdaptor is never a composite id
-    safeFromTupleId = TwoWayString2FieldBridgeAdaptor.class.isAssignableFrom( idBridge.getClass() );
-  }
+  public DocumentBuilder(XClass clazz, InitContext context, DirectoryProvider[] directoryProviders,
+                 IndexShardingStrategy shardingStrategy, ReflectionManager reflectionManager)
+  {
+    this.beanClass = clazz;
+    this.directoryProviders = directoryProviders;
+    this.shardingStrategy = shardingStrategy;
+    //FIXME get rid of it when boost is stored?
+    this.reflectionManager = reflectionManager;
+    this.similarity = context.getDefaultSimilarity();

-  private Analyzer getAnalyzer(XAnnotatedElement annotatedElement, InitContext context) {
-    org.hibernate.search.annotations.Analyzer analyzerAnn =
-        annotatedElement.getAnnotation( org.hibernate.search.annotations.Analyzer.class );
-    return getAnalyzer( analyzerAnn, context );
-  }
+    if (clazz == null) throw new AssertionFailure("Unable to build a DocumentBuilder with a null class");
+    rootPropertiesMetadata.boost = getBoost(clazz);
+    rootPropertiesMetadata.analyzer = context.getDefaultAnalyzer();
+    Set<XClass> processedClasses = new HashSet<XClass>();
+    processedClasses.add(clazz);
+    initializeMembers(clazz, rootPropertiesMetadata, true, "", processedClasses, context);
+    //processedClasses.remove( clazz ); for the sake of completness
+    this.analyzer.setGlobalAnalyzer(rootPropertiesMetadata.analyzer);
+    if (idKeywordName == null)
+    {
+      //check if there is a ProvidedId first.

-  private Analyzer getAnalyzer(org.hibernate.search.annotations.Analyzer analyzerAnn, InitContext context) {
-    Class analyzerClass = analyzerAnn == null ? void.class : analyzerAnn.impl();
-    if ( analyzerClass == void.class ) {
-      String definition = analyzerAnn == null ? "" : analyzerAnn.definition();
-      if ( StringHelper.isEmpty( definition ) ) {
-        return null;
-      }
-      else {
+      ProvidedId provided = clazz.getAnnotation(org.hibernate.search.annotations.ProvidedId.class);
+      if (provided == null) throw new SearchException("No document id in: " + clazz.getName());
+      idBridge = getProvidedIdBridge();
+      idKeywordName = provided.name();

-        return context.buildLazyAnalyzer( definition );
-      }
-    }
-    else {
-      try {
-        return (Analyzer) analyzerClass.newInstance();
-      }
-      catch (ClassCastException e) {
-        throw new SearchException(
-            "Lucene analyzer does not implement " + Analyzer.class.getName() + ": " + analyzerClass.getName(), e
-        );
-      }
-      catch (Exception e) {
-        throw new SearchException( "Failed to instantiate lucene analyzer with type " + analyzerClass.getName(), e );
-      }
-    }
-  }

-  private void initializeMembers(XClass clazz, PropertiesMetadata propertiesMetadata, boolean isRoot, String prefix,
-                  Set<XClass> processedClasses, InitContext context) {
-    List<XClass> hierarchy = new ArrayList<XClass>();
-    for (XClass currClass = clazz; currClass != null; currClass = currClass.getSuperclass()) {
-      hierarchy.add( currClass );
-    }
-    Class similarityClass = null;
-    for (int index = hierarchy.size() - 1; index >= 0; index--) {
-      XClass currClass = hierarchy.get( index );
-      /**
-       * Override the default analyzer for the properties if the class hold one
-       * That's the reason we go down the hierarchy
-       */
-      Analyzer analyzer = getAnalyzer( currClass, context );
+    }
+    //if composite id, use of (a, b) in ((1,2)TwoWayString2FieldBridgeAdaptor, (3,4)) fails on most database
+    //a TwoWayString2FieldBridgeAdaptor is never a composite id
+    safeFromTupleId = TwoWayString2FieldBridgeAdaptor.class.isAssignableFrom(idBridge.getClass());
+  }

-      if ( analyzer != null ) {
-        propertiesMetadata.analyzer = analyzer;
-      }
-      getAnalyzerDefs(currClass, context);
-      // Check for any ClassBridges annotation.
-      ClassBridges classBridgesAnn = currClass.getAnnotation( ClassBridges.class );
-      if ( classBridgesAnn != null ) {
-        ClassBridge[] cbs = classBridgesAnn.value();
-        for (ClassBridge cb : cbs) {
-          bindClassAnnotation( prefix, propertiesMetadata, cb, context );
-        }
-      }
+  private TwoWayFieldBridge getProvidedIdBridge()
+   {
+     return new TwoWayString2FieldBridgeAdaptor(new StringBridge());
+   }

-      // Check for any ClassBridge style of annotations.
-      ClassBridge classBridgeAnn = currClass.getAnnotation( ClassBridge.class );
-      if ( classBridgeAnn != null ) {
-        bindClassAnnotation( prefix, propertiesMetadata, classBridgeAnn, context );
-      }

-      //Get similarity
-      //TODO: similarity form @IndexedEmbedded are not taken care of. Exception??
-      if ( isRoot ) {
-        org.hibernate.search.annotations.Similarity similarityAnn = currClass.getAnnotation( org.hibernate.search.annotations.Similarity.class );
-        if ( similarityAnn != null ) {
-          if ( similarityClass != null ) {
-            throw new SearchException( "Multiple Similarities defined in the same class hierarchy: " + beanClass.getName() );
-          }
-          similarityClass = similarityAnn.impl();
-        }
-      }

-      //rejecting non properties (ie regular methods) because the object is loaded from Hibernate,
-      // so indexing a non property does not make sense
-      List<XProperty> methods = currClass.getDeclaredProperties( XClass.ACCESS_PROPERTY );
-      for (XProperty method : methods) {
-        initializeMember( method, propertiesMetadata, isRoot, prefix, processedClasses, context );
-      }
+  private Analyzer getAnalyzer(XAnnotatedElement annotatedElement, InitContext context)
+  {
+    org.hibernate.search.annotations.Analyzer analyzerAnn =
+         annotatedElement.getAnnotation(org.hibernate.search.annotations.Analyzer.class);
+    return getAnalyzer(analyzerAnn, context);
+  }

-      List<XProperty> fields = currClass.getDeclaredProperties( XClass.ACCESS_FIELD );
-      for (XProperty field : fields) {
-        initializeMember( field, propertiesMetadata, isRoot, prefix, processedClasses, context );
-      }
-    }
-    if ( isRoot && similarityClass != null ) {
-      try {
-        similarity = (Similarity) similarityClass.newInstance();
-      }
-      catch (Exception e) {
-        log.error( "Exception attempting to instantiate Similarity '{}' set for {}",
-            similarityClass.getName(), beanClass.getName() );
-      }
-    }
-  }
+  private Analyzer getAnalyzer(org.hibernate.search.annotations.Analyzer analyzerAnn, InitContext context)
+  {
+    Class analyzerClass = analyzerAnn == null ? void.class : analyzerAnn.impl();
+    if (analyzerClass == void.class)
+    {
+      String definition = analyzerAnn == null ? "" : analyzerAnn.definition();
+      if (StringHelper.isEmpty(definition))
+      {
+        return null;
+      }
+      else
+      {

-  private void getAnalyzerDefs(XAnnotatedElement annotatedElement, InitContext context) {
-    AnalyzerDefs defs = annotatedElement.getAnnotation( AnalyzerDefs.class );
-    if ( defs != null ) {
-      for (AnalyzerDef def : defs.value()) {
-        context.addAnalyzerDef( def );
-      }
-    }
-    AnalyzerDef def = annotatedElement.getAnnotation( AnalyzerDef.class );
-    context.addAnalyzerDef( def );
-  }
+        return context.buildLazyAnalyzer(definition);
+      }
+    }
+    else
+    {
+      try
+      {
+        return (Analyzer) analyzerClass.newInstance();
+      }
+      catch (ClassCastException e)
+      {
+        throw new SearchException(
+             "Lucene analyzer does not implement " + Analyzer.class.getName() + ": " + analyzerClass.getName(), e
+        );
+      }
+      catch (Exception e)
+      {
+        throw new SearchException("Failed to instantiate lucene analyzer with type " + analyzerClass.getName(), e);
+      }
+    }
+  }

-  public String getIdentifierName() {
-    return idGetter.getName();
-  }
+  private void initializeMembers(XClass clazz, PropertiesMetadata propertiesMetadata, boolean isRoot, String prefix,
+                       Set<XClass> processedClasses, InitContext context)
+  {
+    List<XClass> hierarchy = new ArrayList<XClass>();
+    for (XClass currClass = clazz; currClass != null; currClass = currClass.getSuperclass())
+    {
+      hierarchy.add(currClass);
+    }
+    Class similarityClass = null;
+    for (int index = hierarchy.size() - 1; index >= 0; index--)
+    {
+      XClass currClass = hierarchy.get(index);
+      /**
+       * Override the default analyzer for the properties if the class hold one
+       * That's the reason we go down the hierarchy
+       */
+      Analyzer analyzer = getAnalyzer(currClass, context);

-  public Similarity getSimilarity() {
-    return similarity;
-  }
+      if (analyzer != null)
+      {
+        propertiesMetadata.analyzer = analyzer;
+      }
+      getAnalyzerDefs(currClass, context);
+      // Check for any ClassBridges annotation.
+      ClassBridges classBridgesAnn = currClass.getAnnotation(ClassBridges.class);
+      if (classBridgesAnn != null)
+      {
+        ClassBridge[] cbs = classBridgesAnn.value();
+        for (ClassBridge cb : cbs)
+        {
+          bindClassAnnotation(prefix, propertiesMetadata, cb, context);
+        }
+      }

-  private void initializeMember(XProperty member, PropertiesMetadata propertiesMetadata, boolean isRoot,
-                 String prefix, Set<XClass> processedClasses, InitContext context) {
+      // Check for any ClassBridge style of annotations.
+      ClassBridge classBridgeAnn = currClass.getAnnotation(ClassBridge.class);
+      if (classBridgeAnn != null)
+      {
+        bindClassAnnotation(prefix, propertiesMetadata, classBridgeAnn, context);
+      }

-    DocumentId documentIdAnn = member.getAnnotation( DocumentId.class );
-    if ( documentIdAnn != null ) {
-      if ( isRoot ) {
-        if ( idKeywordName != null ) {
-          throw new AssertionFailure( "Two document id assigned: "
-              + idKeywordName + " and " + BinderHelper.getAttributeName( member, documentIdAnn.name() ) );
-        }
-        idKeywordName = prefix + BinderHelper.getAttributeName( member, documentIdAnn.name() );
-        FieldBridge fieldBridge = BridgeFactory.guessType( null, member, reflectionManager );
-        if ( fieldBridge instanceof TwoWayFieldBridge ) {
-          idBridge = (TwoWayFieldBridge) fieldBridge;
-        }
-        else {
-          throw new SearchException(
-              "Bridge for document id does not implement TwoWayFieldBridge: " + member.getName() );
-        }
-        idBoost = getBoost( member );
-        setAccessible( member );
-        idGetter = member;
-      }
-      else {
-        //component should index their document id
-        setAccessible( member );
-        propertiesMetadata.fieldGetters.add( member );
-        String fieldName = prefix + BinderHelper.getAttributeName( member, documentIdAnn.name() );
-        propertiesMetadata.fieldNames.add( fieldName );
-        propertiesMetadata.fieldStore.add( getStore( Store.YES ) );
-        propertiesMetadata.fieldIndex.add( getIndex( Index.UN_TOKENIZED ) );
-        propertiesMetadata.fieldTermVectors.add( getTermVector( TermVector.NO ) );
-        propertiesMetadata.fieldBridges.add( BridgeFactory.guessType( null, member, reflectionManager ) );
-        // property > entity analyzer (no field analyzer)
-        Analyzer analyzer = getAnalyzer( member, context );
-        if ( analyzer == null ) analyzer = propertiesMetadata.analyzer;
-        if ( analyzer == null ) throw new AssertionFailure( "Analizer should not be undefined" );
-        this.analyzer.addScopedAnalyzer( fieldName, analyzer );
-      }
-    }
-    {
-      org.hibernate.search.annotations.Field fieldAnn =
-          member.getAnnotation( org.hibernate.search.annotations.Field.class );
-      if ( fieldAnn != null ) {
-        bindFieldAnnotation( member, propertiesMetadata, prefix, fieldAnn, context );
-      }
-    }
-    {
-      org.hibernate.search.annotations.Fields fieldsAnn =
-          member.getAnnotation( org.hibernate.search.annotations.Fields.class );
-      if ( fieldsAnn != null ) {
-        for (org.hibernate.search.annotations.Field fieldAnn : fieldsAnn.value()) {
-          bindFieldAnnotation( member, propertiesMetadata, prefix, fieldAnn, context );
-        }
-      }
-    }
-    getAnalyzerDefs( member, context );
+      //Get similarity
+      //TODO: similarity form @IndexedEmbedded are not taken care of. Exception??
+      if (isRoot)
+      {
+        org.hibernate.search.annotations.Similarity similarityAnn = currClass.getAnnotation(org.hibernate.search.annotations.Similarity.class);
+        if (similarityAnn != null)
+        {
+          if (similarityClass != null)
+          {
+            throw new SearchException("Multiple Similarities defined in the same class hierarchy: " + beanClass.getName());
+          }
+          similarityClass = similarityAnn.impl();
+        }
+      }

-    IndexedEmbedded embeddedAnn = member.getAnnotation( IndexedEmbedded.class );
-    if ( embeddedAnn != null ) {
-      int oldMaxLevel = maxLevel;
-      int potentialLevel = embeddedAnn.depth() + level;
-      if ( potentialLevel < 0 ) {
-        potentialLevel = Integer.MAX_VALUE;
-      }
-      maxLevel = potentialLevel > maxLevel ? maxLevel : potentialLevel;
-      level++;
+      //rejecting non properties (ie regular methods) because the object is loaded from Hibernate,
+      // so indexing a non property does not make sense
+      List<XProperty> methods = currClass.getDeclaredProperties(XClass.ACCESS_PROPERTY);
+      for (XProperty method : methods)
+      {
+        initializeMember(method, propertiesMetadata, isRoot, prefix, processedClasses, context);
+      }

-      XClass elementClass;
-      if ( void.class == embeddedAnn.targetElement() ) {
-        elementClass = member.getElementClass();
-      }
-      else {
-        elementClass = reflectionManager.toXClass( embeddedAnn.targetElement() );
-      }
-      if ( maxLevel == Integer.MAX_VALUE //infinite
-          && processedClasses.contains( elementClass ) ) {
-        throw new SearchException(
-            "Circular reference. Duplicate use of "
-                + elementClass.getName()
-                + " in root entity " + beanClass.getName()
-                + "#" + buildEmbeddedPrefix( prefix, embeddedAnn, member )
-        );
-      }
-      if ( level <= maxLevel ) {
-        processedClasses.add( elementClass ); //push
+      List<XProperty> fields = currClass.getDeclaredProperties(XClass.ACCESS_FIELD);
+      for (XProperty field : fields)
+      {
+        initializeMember(field, propertiesMetadata, isRoot, prefix, processedClasses, context);
+      }
+    }
+    if (isRoot && similarityClass != null)
+    {
+      try
+      {
+        similarity = (Similarity) similarityClass.newInstance();
+      }
+      catch (Exception e)
+      {
+        log.error("Exception attempting to instantiate Similarity '{}' set for {}",
+             similarityClass.getName(), beanClass.getName());
+      }
+    }
+  }

-        setAccessible( member );
-        propertiesMetadata.embeddedGetters.add( member );
-        PropertiesMetadata metadata = new PropertiesMetadata();
-        propertiesMetadata.embeddedPropertiesMetadata.add( metadata );
-        metadata.boost = getBoost( member );
-        //property > entity analyzer
-        Analyzer analyzer = getAnalyzer( member, context );
-        metadata.analyzer = analyzer != null ? analyzer : propertiesMetadata.analyzer;
-        String localPrefix = buildEmbeddedPrefix( prefix, embeddedAnn, member );
-        initializeMembers( elementClass, metadata, false, localPrefix, processedClasses, context );
-        /**
-         * We will only index the "expected" type but that's OK, HQL cannot do downcasting either
-         */
-        if ( member.isArray() ) {
-          propertiesMetadata.embeddedContainers.add( PropertiesMetadata.Container.ARRAY );
-        }
-        else if ( member.isCollection() ) {
-          if ( Map.class.equals( member.getCollectionClass() ) ) {
-            //hum subclasses etc etc??
-            propertiesMetadata.embeddedContainers.add( PropertiesMetadata.Container.MAP );
-          }
-          else {
-            propertiesMetadata.embeddedContainers.add( PropertiesMetadata.Container.COLLECTION );
-          }
-        }
-        else {
-          propertiesMetadata.embeddedContainers.add( PropertiesMetadata.Container.OBJECT );
-        }
+  private void getAnalyzerDefs(XAnnotatedElement annotatedElement, InitContext context)
+  {
+    AnalyzerDefs defs = annotatedElement.getAnnotation(AnalyzerDefs.class);
+    if (defs != null)
+    {
+      for (AnalyzerDef def : defs.value())
+      {
+        context.addAnalyzerDef(def);
+      }
+    }
+    AnalyzerDef def = annotatedElement.getAnnotation(AnalyzerDef.class);
+    context.addAnalyzerDef(def);
+  }

-        processedClasses.remove( elementClass ); //pop
-      }
-      else if ( log.isTraceEnabled() ) {
-        String localPrefix = buildEmbeddedPrefix( prefix, embeddedAnn, member );
-        log.trace( "depth reached, ignoring {}", localPrefix );
-      }
+  public String getIdentifierName()
+  {
+    return idGetter.getName();
+  }

-      level--;
-      maxLevel = oldMaxLevel; //set back the the old max level
-    }
+  public Similarity getSimilarity()
+  {
+    return similarity;
+  }

-    ContainedIn containedAnn = member.getAnnotation( ContainedIn.class );
-    if ( containedAnn != null ) {
-      setAccessible( member );
-      propertiesMetadata.containedInGetters.add( member );
-    }
-  }
+  private void initializeMember(XProperty member, PropertiesMetadata propertiesMetadata, boolean isRoot,
+                      String prefix, Set<XClass> processedClasses, InitContext context)
+  {

-  private void bindClassAnnotation(String prefix, PropertiesMetadata propertiesMetadata, ClassBridge ann, InitContext context) {
-    //FIXME name should be prefixed
-    String fieldName = prefix + ann.name();
-    propertiesMetadata.classNames.add( fieldName );
-    propertiesMetadata.classStores.add( getStore( ann.store() ) );
-    propertiesMetadata.classIndexes.add( getIndex( ann.index() ) );
-    propertiesMetadata.classTermVectors.add( getTermVector( ann.termVector() ) );
-    propertiesMetadata.classBridges.add( BridgeFactory.extractType( ann ) );
-    propertiesMetadata.classBoosts.add( ann.boost().value() );
+    DocumentId documentIdAnn = member.getAnnotation(DocumentId.class);
+    if (documentIdAnn != null)
+    {
+      if (isRoot)
+      {
+        if (idKeywordName != null)
+        {
+          throw new AssertionFailure("Two document id assigned: "
+               + idKeywordName + " and " + BinderHelper.getAttributeName(member, documentIdAnn.name()));
+        }
+        idKeywordName = prefix + BinderHelper.getAttributeName(member, documentIdAnn.name());
+        FieldBridge fieldBridge = BridgeFactory.guessType(null, member, reflectionManager);
+        if (fieldBridge instanceof TwoWayFieldBridge)
+        {
+          idBridge = (TwoWayFieldBridge) fieldBridge;
+        }
+        else
+        {
+          throw new SearchException(
+               "Bridge for document id does not implement TwoWayFieldBridge: " + member.getName());
+        }
+        idBoost = getBoost(member);
+        setAccessible(member);
+        idGetter = member;
+      }
+      else
+      {
+        //component should index their document id
+        setAccessible(member);
+        propertiesMetadata.fieldGetters.add(member);
+        String fieldName = prefix + BinderHelper.getAttributeName(member, documentIdAnn.name());
+        propertiesMetadata.fieldNames.add(fieldName);
+        propertiesMetadata.fieldStore.add(getStore(Store.YES));
+        propertiesMetadata.fieldIndex.add(getIndex(Index.UN_TOKENIZED));
+        propertiesMetadata.fieldTermVectors.add(getTermVector(TermVector.NO));
+        propertiesMetadata.fieldBridges.add(BridgeFactory.guessType(null, member, reflectionManager));
+        // property > entity analyzer (no field analyzer)
+        Analyzer analyzer = getAnalyzer(member, context);
+        if (analyzer == null) analyzer = propertiesMetadata.analyzer;
+        if (analyzer == null) throw new AssertionFailure("Analizer should not be undefined");
+        this.analyzer.addScopedAnalyzer(fieldName, analyzer);
+      }
+    }
+    {
+      org.hibernate.search.annotations.Field fieldAnn =
+           member.getAnnotation(org.hibernate.search.annotations.Field.class);
+      if (fieldAnn != null)
+      {
+        bindFieldAnnotation(member, propertiesMetadata, prefix, fieldAnn, context);
+      }
+    }
+    {
+      org.hibernate.search.annotations.Fields fieldsAnn =
+           member.getAnnotation(org.hibernate.search.annotations.Fields.class);
+      if (fieldsAnn != null)
+      {
+        for (org.hibernate.search.annotations.Field fieldAnn : fieldsAnn.value())
+        {
+          bindFieldAnnotation(member, propertiesMetadata, prefix, fieldAnn, context);
+        }
+      }
+    }
+    getAnalyzerDefs(member, context);

-    Analyzer analyzer = getAnalyzer( ann.analyzer(), context );
-    if ( analyzer == null ) analyzer = propertiesMetadata.analyzer;
-    if ( analyzer == null ) throw new AssertionFailure( "Analyzer should not be undefined" );
-    this.analyzer.addScopedAnalyzer( fieldName, analyzer );
-  }
+    IndexedEmbedded embeddedAnn = member.getAnnotation(IndexedEmbedded.class);
+    if (embeddedAnn != null)
+    {
+      int oldMaxLevel = maxLevel;
+      int potentialLevel = embeddedAnn.depth() + level;
+      if (potentialLevel < 0)
+      {
+        potentialLevel = Integer.MAX_VALUE;
+      }
+      maxLevel = potentialLevel > maxLevel ? maxLevel : potentialLevel;
+      level++;

-  private void bindFieldAnnotation(XProperty member, PropertiesMetadata propertiesMetadata, String prefix, org.hibernate.search.annotations.Field fieldAnn, InitContext context) {
-    setAccessible( member );
-    propertiesMetadata.fieldGetters.add( member );
-    String fieldName = prefix + BinderHelper.getAttributeName( member, fieldAnn.name() );
-    propertiesMetadata.fieldNames.add( fieldName );
-    propertiesMetadata.fieldStore.add( getStore( fieldAnn.store() ) );
-    propertiesMetadata.fieldIndex.add( getIndex( fieldAnn.index() ) );
-    propertiesMetadata.fieldTermVectors.add( getTermVector( fieldAnn.termVector() ) );
-    propertiesMetadata.fieldBridges.add( BridgeFactory.guessType( fieldAnn, member, reflectionManager ) );
+      XClass elementClass;
+      if (void.class == embeddedAnn.targetElement())
+      {
+        elementClass = member.getElementClass();
+      }
+      else
+      {
+        elementClass = reflectionManager.toXClass(embeddedAnn.targetElement());
+      }
+      if (maxLevel == Integer.MAX_VALUE //infinite
+           && processedClasses.contains(elementClass))
+      {
+        throw new SearchException(
+             "Circular reference. Duplicate use of "
+                   + elementClass.getName()
+                   + " in root entity " + beanClass.getName()
+                   + "#" + buildEmbeddedPrefix(prefix, embeddedAnn, member)
+        );
+      }
+      if (level <= maxLevel)
+      {
+        processedClasses.add(elementClass); //push

-    // Field > property > entity analyzer
-    Analyzer analyzer = getAnalyzer( fieldAnn.analyzer(), context );
-    if ( analyzer == null ) analyzer = getAnalyzer( member, context );
-    if ( analyzer == null ) analyzer = propertiesMetadata.analyzer;
-    if ( analyzer == null ) throw new AssertionFailure( "Analizer should not be undefined" );
-    this.analyzer.addScopedAnalyzer( fieldName, analyzer );
-  }
+        setAccessible(member);
+        propertiesMetadata.embeddedGetters.add(member);
+        PropertiesMetadata metadata = new PropertiesMetadata();
+        propertiesMetadata.embeddedPropertiesMetadata.add(metadata);
+        metadata.boost = getBoost(member);
+        //property > entity analyzer
+        Analyzer analyzer = getAnalyzer(member, context);
+        metadata.analyzer = analyzer != null ? analyzer : propertiesMetadata.analyzer;
+        String localPrefix = buildEmbeddedPrefix(prefix, embeddedAnn, member);
+        initializeMembers(elementClass, metadata, false, localPrefix, processedClasses, context);
+        /**
+         * We will only index the "expected" type but that's OK, HQL cannot do downcasting either
+         */
+        if (member.isArray())
+        {
+          propertiesMetadata.embeddedContainers.add(PropertiesMetadata.Container.ARRAY);
+        }
+        else if (member.isCollection())
+        {
+          if (Map.class.equals(member.getCollectionClass()))
+          {
+            //hum subclasses etc etc??
+            propertiesMetadata.embeddedContainers.add(PropertiesMetadata.Container.MAP);
+          }
+          else
+          {
+            propertiesMetadata.embeddedContainers.add(PropertiesMetadata.Container.COLLECTION);
+          }
+        }
+        else
+        {
+          propertiesMetadata.embeddedContainers.add(PropertiesMetadata.Container.OBJECT);
+        }

-  private String buildEmbeddedPrefix(String prefix, IndexedEmbedded embeddedAnn, XProperty member) {
-    String localPrefix = prefix;
-    if ( ".".equals( embeddedAnn.prefix() ) ) {
-      //default to property name
-      localPrefix += member.getName() + '.';
-    }
-    else {
-      localPrefix += embeddedAnn.prefix();
-    }
-    return localPrefix;
-  }
+        processedClasses.remove(elementClass); //pop
+      }
+      else if (log.isTraceEnabled())
+      {
+        String localPrefix = buildEmbeddedPrefix(prefix, embeddedAnn, member);
+        log.trace("depth reached, ignoring {}", localPrefix);
+      }

-  private Field.Store getStore(Store store) {
-    switch ( store ) {
-      case NO:
-        return Field.Store.NO;
-      case YES:
-        return Field.Store.YES;
-      case COMPRESS:
-        return Field.Store.COMPRESS;
-      default:
-        throw new AssertionFailure( "Unexpected Store: " + store );
-    }
-  }
+      level--;
+      maxLevel = oldMaxLevel; //set back the the old max level
+    }

-  private Field.TermVector getTermVector(TermVector vector) {
-    switch ( vector ) {
-      case NO:
-        return Field.TermVector.NO;
-      case YES:
-        return Field.TermVector.YES;
-      case WITH_OFFSETS:
-        return Field.TermVector.WITH_OFFSETS;
-      case WITH_POSITIONS:
-        return Field.TermVector.WITH_POSITIONS;
-      case WITH_POSITION_OFFSETS:
-        return Field.TermVector.WITH_POSITIONS_OFFSETS;
-      default:
-        throw new AssertionFailure( "Unexpected TermVector: " + vector );
-    }
-  }
+    ContainedIn containedAnn = member.getAnnotation(ContainedIn.class);
+    if (containedAnn != null)
+    {
+      setAccessible(member);
+      propertiesMetadata.containedInGetters.add(member);
+    }
+  }

-  private Field.Index getIndex(Index index) {
-    switch ( index ) {
-      case NO:
-        return Field.Index.NO;
-      case NO_NORMS:
-        return Field.Index.NO_NORMS;
-      case TOKENIZED:
-        return Field.Index.TOKENIZED;
-      case UN_TOKENIZED:
-        return Field.Index.UN_TOKENIZED;
-      default:
-        throw new AssertionFailure( "Unexpected Index: " + index );
-    }
-  }
+  private void bindClassAnnotation(String prefix, PropertiesMetadata propertiesMetadata, ClassBridge ann, InitContext context)
+  {
+    //FIXME name should be prefixed
+    String fieldName = prefix + ann.name();
+    propertiesMetadata.classNames.add(fieldName);
+    propertiesMetadata.classStores.add(getStore(ann.store()));
+    propertiesMetadata.classIndexes.add(getIndex(ann.index()));
+    propertiesMetadata.classTermVectors.add(getTermVector(ann.termVector()));
+    propertiesMetadata.classBridges.add(BridgeFactory.extractType(ann));
+    propertiesMetadata.classBoosts.add(ann.boost().value());

-  private Float getBoost(XAnnotatedElement element) {
-    if ( element == null ) return null;
-    Boost boost = element.getAnnotation( Boost.class );
-    return boost != null ?
-        boost.value() :
-        null;
-  }
+    Analyzer analyzer = getAnalyzer(ann.analyzer(), context);
+    if (analyzer == null) analyzer = propertiesMetadata.analyzer;
+    if (analyzer == null) throw new AssertionFailure("Analyzer should not be undefined");
+    this.analyzer.addScopedAnalyzer(fieldName, analyzer);
+  }

-  private Object getMemberValue(Object bean, XMember getter) {
-    Object value;
-    try {
-      value = getter.invoke( bean );
-    }
-    catch (Exception e) {
-      throw new IllegalStateException( "Could not get property value", e );
-    }
-    return value;
-  }
+  private void bindFieldAnnotation(XProperty member, PropertiesMetadata propertiesMetadata, String prefix, org.hibernate.search.annotations.Field fieldAnn, InitContext context)
+  {
+    setAccessible(member);
+    propertiesMetadata.fieldGetters.add(member);
+    String fieldName = prefix + BinderHelper.getAttributeName(member, fieldAnn.name());
+    propertiesMetadata.fieldNames.add(fieldName);
+    propertiesMetadata.fieldStore.add(getStore(fieldAnn.store()));
+    propertiesMetadata.fieldIndex.add(getIndex(fieldAnn.index()));
+    propertiesMetadata.fieldTermVectors.add(getTermVector(fieldAnn.termVector()));
+    propertiesMetadata.fieldBridges.add(BridgeFactory.guessType(fieldAnn, member, reflectionManager));

-  //TODO could we use T instead of EntityClass?
-  public void addWorkToQueue(Class entityClass, T entity, Serializable id, WorkType workType, List<LuceneWork> queue, SearchFactoryImplementor searchFactoryImplementor) {
-    //TODO with the caller loop we are in a n^2: optimize it using a HashMap for work recognition
-    for (LuceneWork luceneWork : queue) {
-      //any work on the same entity should be ignored
-      if ( luceneWork.getEntityClass() == entityClass
-          ) {
-        Serializable currentId = luceneWork.getId();
-        if ( currentId != null && currentId.equals( id ) ) { //find a way to use Type.equals(x,y)
-          return;
-        }
-        //TODO do something to avoid multiple PURGE ALL and OPTIMIZE
-      }
+    // Field > property > entity analyzer
+    Analyzer analyzer = getAnalyzer(fieldAnn.analyzer(), context);
+    if (analyzer == null) analyzer = getAnalyzer(member, context);
+    if (analyzer == null) analyzer = propertiesMetadata.analyzer;
+    if (analyzer == null) throw new AssertionFailure("Analizer should not be undefined");
+    this.analyzer.addScopedAnalyzer(fieldName, analyzer);
+  }

-    }
-    boolean searchForContainers = false;
-    String idInString = idBridge.objectToString( id );
-    if ( workType == WorkType.ADD ) {
-      Document doc = getDocument( entity, id );
-      queue.add( new AddLuceneWork( id, idInString, entityClass, doc ) );
-      searchForContainers = true;
-    }
-    else if ( workType == WorkType.DELETE || workType == WorkType.PURGE ) {
-      queue.add( new DeleteLuceneWork( id, idInString, entityClass ) );
-    }
-    else if ( workType == WorkType.PURGE_ALL ) {
-      queue.add( new PurgeAllLuceneWork( entityClass ) );
-    }
-    else if ( workType == WorkType.UPDATE || workType == WorkType.COLLECTION ) {
-      Document doc = getDocument( entity, id );
-      /**
-       * even with Lucene 2.1, use of indexWriter to update is not an option
-       * We can only delete by term, and the index doesn't have a term that
-       * uniquely identify the entry.
-       * But essentially the optimization we are doing is the same Lucene is doing, the only extra cost is the
-       * double file opening.
-       */
-      queue.add( new DeleteLuceneWork( id, idInString, entityClass ) );
-      queue.add( new AddLuceneWork( id, idInString, entityClass, doc ) );
-      searchForContainers = true;
-    }
-    else if ( workType == WorkType.INDEX ) {
-      Document doc = getDocument( entity, id );
-      queue.add( new DeleteLuceneWork( id, idInString, entityClass ) );
-      LuceneWork work = new AddLuceneWork( id, idInString, entityClass, doc );
-      work.setBatch( true );
-      queue.add( work );
-      searchForContainers = true;
-    }
+  private String buildEmbeddedPrefix(String prefix, IndexedEmbedded embeddedAnn, XProperty member)
+  {
+    String localPrefix = prefix;
+    if (".".equals(embeddedAnn.prefix()))
+    {
+      //default to property name
+      localPrefix += member.getName() + '.';
+    }
+    else
+    {
+      localPrefix += embeddedAnn.prefix();
+    }
+    return localPrefix;
+  }

-    else {
-      throw new AssertionFailure( "Unknown WorkType: " + workType );
-    }
+  private Field.Store getStore(Store store)
+  {
+    switch (store)
+    {
+      case NO:
+        return Field.Store.NO;
+      case YES:
+        return Field.Store.YES;
+      case COMPRESS:
+        return Field.Store.COMPRESS;
+      default:
+        throw new AssertionFailure("Unexpected Store: " + store);
+    }
+  }

-    /**
-     * When references are changed, either null or another one, we expect dirty checking to be triggered (both sides
-     * have to be updated)
-     * When the internal object is changed, we apply the {Add|Update}Work on containedIns
-     */
-    if ( searchForContainers ) {
-      processContainedIn( entity, queue, rootPropertiesMetadata, searchFactoryImplementor );
-    }
-  }
+  private Field.TermVector getTermVector(TermVector vector)
+  {
+    switch (vector)
+    {
+      case NO:
+        return Field.TermVector.NO;
+      case YES:
+        return Field.TermVector.YES;
+      case WITH_OFFSETS:
+        return Field.TermVector.WITH_OFFSETS;
+      case WITH_POSITIONS:
+        return Field.TermVector.WITH_POSITIONS;
+      case WITH_POSITION_OFFSETS:
+        return Field.TermVector.WITH_POSITIONS_OFFSETS;
+      default:
+        throw new AssertionFailure("Unexpected TermVector: " + vector);
+    }
+  }

-  private void processContainedIn(Object instance, List<LuceneWork> queue, PropertiesMetadata metadata, SearchFactoryImplementor searchFactoryImplementor) {
-    for (int i = 0; i < metadata.containedInGetters.size(); i++) {
-      XMember member = metadata.containedInGetters.get( i );
-      Object value = getMemberValue( instance, member );
-      if ( value == null ) continue;
+  private Field.Index getIndex(Index index)
+  {
+    switch (index)
+    {
+      case NO:
+        return Field.Index.NO;
+      case NO_NORMS:
+        return Field.Index.NO_NORMS;
+      case TOKENIZED:
+        return Field.Index.TOKENIZED;
+      case UN_TOKENIZED:
+        return Field.Index.UN_TOKENIZED;
+      default:
+        throw new AssertionFailure("Unexpected Index: " + index);
+    }
+  }

-      if ( member.isArray() ) {
-        for (Object arrayValue : (Object[]) value) {
-          //highly inneficient but safe wrt the actual targeted class
-          Class valueClass = Hibernate.getClass( arrayValue );
-          DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( valueClass );
-          if ( builder == null ) continue;
-          processContainedInValue( arrayValue, queue, valueClass, builder, searchFactoryImplementor );
-        }
-      }
-      else if ( member.isCollection() ) {
-        Collection collection;
-        if ( Map.class.equals( member.getCollectionClass() ) ) {
-          //hum
-          collection = ( (Map) value ).values();
-        }
-        else {
-          collection = (Collection) value;
-        }
-        for (Object collectionValue : collection) {
-          //highly inneficient but safe wrt the actual targeted class
-          Class valueClass = Hibernate.getClass( collectionValue );
-          DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( valueClass );
-          if ( builder == null ) continue;
-          processContainedInValue( collectionValue, queue, valueClass, builder, searchFactoryImplementor );
-        }
-      }
-      else {
-        Class valueClass = Hibernate.getClass( value );
-        DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( valueClass );
-        if ( builder == null ) continue;
-        processContainedInValue( value, queue, valueClass, builder, searchFactoryImplementor );
-      }
-    }
-    //an embedded cannot have a useful @ContainedIn (no shared reference)
-    //do not walk through them
-  }
+  private Float getBoost(XAnnotatedElement element)
+  {
+    if (element == null) return null;
+    Boost boost = element.getAnnotation(Boost.class);
+    return boost != null ?
+         boost.value() :
+         null;
+  }

-  private void processContainedInValue(Object value, List<LuceneWork> queue, Class valueClass,
-                     DocumentBuilder builder, SearchFactoryImplementor searchFactoryImplementor) {
-    Serializable id = (Serializable) builder.getMemberValue( value, builder.idGetter );
-    builder.addWorkToQueue( valueClass, value, id, WorkType.UPDATE, queue, searchFactoryImplementor );
-  }
+  private Object getMemberValue(Object bean, XMember getter)
+  {
+    Object value;
+    try
+    {
+      value = getter.invoke(bean);
+    }
+    catch (Exception e)
+    {
+      throw new IllegalStateException("Could not get property value", e);
+    }
+    return value;
+  }

-  public Document getDocument(T instance, Serializable id) {
-    Document doc = new Document();
-    XClass instanceClass = reflectionManager.toXClass( Hibernate.getClass( instance ) );
-    if ( rootPropertiesMetadata.boost != null ) {
-      doc.setBoost( rootPropertiesMetadata.boost );
-    }
-    {
-      Field classField =
-          new Field( CLASS_FIELDNAME, instanceClass.getName(), Field.Store.YES, Field.Index.UN_TOKENIZED, Field.TermVector.NO );
-      doc.add( classField );
-      LuceneOptions luceneOptions = new LuceneOptions(Field.Store.YES,
-          Field.Index.UN_TOKENIZED, Field.TermVector.NO, idBoost);
-      idBridge.set( idKeywordName, id, doc, luceneOptions );
-    }
-    buildDocumentFields( instance, doc, rootPropertiesMetadata );
-    return doc;
-  }
+  //TODO could we use T instead of EntityClass?
+  public void addWorkToQueue(Class entityClass, T entity, Serializable id, WorkType workType, List<LuceneWork> queue, SearchFactoryImplementor searchFactoryImplementor)
+  {
+    //TODO with the caller loop we are in a n^2: optimize it using a HashMap for work recognition
+    for (LuceneWork luceneWork : queue)
+    {
+      //any work on the same entity should be ignored
+      if (luceneWork.getEntityClass() == entityClass
+           )
+      {
+        Serializable currentId = luceneWork.getId();
+        if (currentId != null && currentId.equals(id))
+        { //find a way to use Type.equals(x,y)
+          return;
+        }
+        //TODO do something to avoid multiple PURGE ALL and OPTIMIZE
+      }

-  private void buildDocumentFields(Object instance, Document doc, PropertiesMetadata propertiesMetadata) {
-    if ( instance == null ) return;
-    //needed for field access: I cannot work in the proxied version
-    Object unproxiedInstance = unproxy( instance );
-    for (int i = 0; i < propertiesMetadata.classBridges.size(); i++) {
-      FieldBridge fb = propertiesMetadata.classBridges.get( i );
-      fb.set(propertiesMetadata.classNames.get(i), unproxiedInstance,
-          doc, propertiesMetadata.getClassLuceneOptions(i));
-    }
-    for (int i = 0; i < propertiesMetadata.fieldNames.size(); i++) {
-      XMember member = propertiesMetadata.fieldGetters.get( i );
-      Object value = getMemberValue( unproxiedInstance, member );
-      propertiesMetadata.fieldBridges.get(i).set(
-          propertiesMetadata.fieldNames.get(i), value, doc,
-          propertiesMetadata.getFieldLuceneOptions(i, getBoost(member)));
-    }
-    for (int i = 0; i < propertiesMetadata.embeddedGetters.size(); i++) {
-      XMember member = propertiesMetadata.embeddedGetters.get( i );
-      Object value = getMemberValue( unproxiedInstance, member );
-      //TODO handle boost at embedded level: already stored in propertiesMedatada.boost
+    }
+    boolean searchForContainers = false;
+    String idInString = idBridge.objectToString(id);
+    if (workType == WorkType.ADD)
+    {
+      Document doc = getDocument(entity, id);
+      queue.add(new AddLuceneWork(id, idInString, entityClass, doc));
+      searchForContainers = true;
+    }
+    else if (workType == WorkType.DELETE || workType == WorkType.PURGE)
+    {
+      queue.add(new DeleteLuceneWork(id, idInString, entityClass));
+    }
+    else if (workType == WorkType.PURGE_ALL)
+    {
+      queue.add(new PurgeAllLuceneWork(entityClass));
+    }
+    else if (workType == WorkType.UPDATE || workType == WorkType.COLLECTION)
+    {
+      Document doc = getDocument(entity, id);
+      /**
+       * even with Lucene 2.1, use of indexWriter to update is not an option
+       * We can only delete by term, and the index doesn't have a term that
+       * uniquely identify the entry.
+       * But essentially the optimization we are doing is the same Lucene is doing, the only extra cost is the
+       * double file opening.
+       */
+      queue.add(new DeleteLuceneWork(id, idInString, entityClass));
+      queue.add(new AddLuceneWork(id, idInString, entityClass, doc));
+      searchForContainers = true;
+    }
+    else if (workType == WorkType.INDEX)
+    {
+      Document doc = getDocument(entity, id);
+      queue.add(new DeleteLuceneWork(id, idInString, entityClass));
+      LuceneWork work = new AddLuceneWork(id, idInString, entityClass, doc);
+      work.setBatch(true);
+      queue.add(work);
+      searchForContainers = true;
+    }

-      if ( value == null ) continue;
-      PropertiesMetadata embeddedMetadata = propertiesMetadata.embeddedPropertiesMetadata.get( i );
-      switch ( propertiesMetadata.embeddedContainers.get( i ) ) {
-        case ARRAY:
-          for (Object arrayValue : (Object[]) value) {
-            buildDocumentFields( arrayValue, doc, embeddedMetadata );
-          }
-          break;
-        case COLLECTION:
-          for (Object collectionValue : (Collection) value) {
-            buildDocumentFields( collectionValue, doc, embeddedMetadata );
-          }
-          break;
-        case MAP:
-          for (Object collectionValue : ( (Map) value ).values()) {
-            buildDocumentFields( collectionValue, doc, embeddedMetadata );
-          }
-          break;
-        case OBJECT:
-          buildDocumentFields( value, doc, embeddedMetadata );
-          break;
-        default:
-          throw new AssertionFailure( "Unknown embedded container: "
-              + propertiesMetadata.embeddedContainers.get( i ) );
-      }
-    }
-  }
+    else
+    {
+      throw new AssertionFailure("Unknown WorkType: " + workType);
+    }

-  private Object unproxy(Object value) {
-    //FIXME this service should be part of Core?
-    if ( value instanceof HibernateProxy ) {
-      // .getImplementation() initializes the data by side effect
-      value = ( (HibernateProxy) value ).getHibernateLazyInitializer()
-          .getImplementation();
-    }
-    return value;
-  }
+    /**
+     * When references are changed, either null or another one, we expect dirty checking to be triggered (both sides
+     * have to be updated)
+     * When the internal object is changed, we apply the {Add|Update}Work on containedIns
+     */
+    if (searchForContainers)
+    {
+      processContainedIn(entity, queue, rootPropertiesMetadata, searchFactoryImplementor);
+    }
+  }

-  public Term getTerm(Serializable id) {
-    return new Term( idKeywordName, idBridge.objectToString( id ) );
-  }
+  private void processContainedIn(Object instance, List<LuceneWork> queue, PropertiesMetadata metadata, SearchFactoryImplementor searchFactoryImplementor)
+  {
+    for (int i = 0; i < metadata.containedInGetters.size(); i++)
+    {
+      XMember member = metadata.containedInGetters.get(i);
+      Object value = getMemberValue(instance, member);
+      if (value == null) continue;

-  public DirectoryProvider[] getDirectoryProviders() {
-    return directoryProviders;
-  }
+      if (member.isArray())
+      {
+        for (Object arrayValue : (Object[]) value)
+        {
+          //highly inneficient but safe wrt the actual targeted class
+          Class valueClass = Hibernate.getClass(arrayValue);
+          DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get(valueClass);
+          if (builder == null) continue;
+          processContainedInValue(arrayValue, queue, valueClass, builder, searchFactoryImplementor);
+        }
+      }
+      else if (member.isCollection())
+      {
+        Collection collection;
+        if (Map.class.equals(member.getCollectionClass()))
+        {
+          //hum
+          collection = ((Map) value).values();
+        }
+        else
+        {
+          collection = (Collection) value;
+        }
+        for (Object collectionValue : collection)
+        {
+          //highly inneficient but safe wrt the actual targeted class
+          Class valueClass = Hibernate.getClass(collectionValue);
+          DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get(valueClass);
+          if (builder == null) continue;
+          processContainedInValue(collectionValue, queue, valueClass, builder, searchFactoryImplementor);
+        }
+      }
+      else
+      {
+        Class valueClass = Hibernate.getClass(value);
+        DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get(valueClass);
+        if (builder == null) continue;
+        processContainedInValue(value, queue, valueClass, builder, searchFactoryImplementor);
+      }
+    }
+    //an embedded cannot have a useful @ContainedIn (no shared reference)
+    //do not walk through them
+  }

-  public IndexShardingStrategy getDirectoryProviderSelectionStrategy() {
-    return shardingStrategy;
-  }
+  private void processContainedInValue(Object value, List<LuceneWork> queue, Class valueClass,
+                           DocumentBuilder builder, SearchFactoryImplementor searchFactoryImplementor)
+  {
+    Serializable id = (Serializable) builder.getMemberValue(value, builder.idGetter);
+    builder.addWorkToQueue(valueClass, value, id, WorkType.UPDATE, queue, searchFactoryImplementor);
+  }

-  public Analyzer getAnalyzer() {
-    return analyzer;
-  }
+  public Document getDocument(T instance, Serializable id)
+  {
+    Document doc = new Document();
+    XClass instanceClass = reflectionManager.toXClass(Hibernate.getClass(instance));
+    if (rootPropertiesMetadata.boost != null)
+    {
+      doc.setBoost(rootPropertiesMetadata.boost);
+    }
+    {
+      Field classField =
+           new Field(CLASS_FIELDNAME, instanceClass.getName(), Field.Store.YES, Field.Index.UN_TOKENIZED, Field.TermVector.NO);
+      doc.add(classField);
+      LuceneOptions luceneOptions = new LuceneOptions(Field.Store.YES,
+           Field.Index.UN_TOKENIZED, Field.TermVector.NO, idBoost);
+      idBridge.set(idKeywordName, id, doc, luceneOptions);
+    }
+    buildDocumentFields(instance, doc, rootPropertiesMetadata);
+    return doc;
+  }

-  private static void setAccessible(XMember member) {
-    if ( !Modifier.isPublic( member.getModifiers() ) ) {
-      member.setAccessible( true );
-    }
-  }
+  private void buildDocumentFields(Object instance, Document doc, PropertiesMetadata propertiesMetadata)
+  {
+    if (instance == null) return;
+    //needed for field access: I cannot work in the proxied version
+    Object unproxiedInstance = unproxy(instance);
+    for (int i = 0; i < propertiesMetadata.classBridges.size(); i++)
+    {
+      FieldBridge fb = propertiesMetadata.classBridges.get(i);
+      fb.set(propertiesMetadata.classNames.get(i), unproxiedInstance,
+           doc, propertiesMetadata.getClassLuceneOptions(i));
+    }
+    for (int i = 0; i < propertiesMetadata.fieldNames.size(); i++)
+    {
+      XMember member = propertiesMetadata.fieldGetters.get(i);
+      Object value = getMemberValue(unproxiedInstance, member);
+      propertiesMetadata.fieldBridges.get(i).set(
+           propertiesMetadata.fieldNames.get(i), value, doc,
+           propertiesMetadata.getFieldLuceneOptions(i, getBoost(member)));
+    }
+    for (int i = 0; i < propertiesMetadata.embeddedGetters.size(); i++)
+    {
+      XMember member = propertiesMetadata.embeddedGetters.get(i);
+      Object value = getMemberValue(unproxiedInstance, member);
+      //TODO handle boost at embedded level: already stored in propertiesMedatada.boost

-  public TwoWayFieldBridge getIdBridge() {
-    return idBridge;
-  }
+      if (value == null) continue;
+      PropertiesMetadata embeddedMetadata = propertiesMetadata.embeddedPropertiesMetadata.get(i);
+      switch (propertiesMetadata.embeddedContainers.get(i))
+      {
+        case ARRAY:
+          for (Object arrayValue : (Object[]) value)
+          {
+            buildDocumentFields(arrayValue, doc, embeddedMetadata);
+          }
+          break;
+        case COLLECTION:
+          for (Object collectionValue : (Collection) value)
+          {
+            buildDocumentFields(collectionValue, doc, embeddedMetadata);
+          }
+          break;
+        case MAP:
+          for (Object collectionValue : ((Map) value).values())
+          {
+            buildDocumentFields(collectionValue, doc, embeddedMetadata);
+          }
+          break;
+        case OBJECT:
+          buildDocumentFields(value, doc, embeddedMetadata);
+          break;
+        default:
+          throw new AssertionFailure("Unknown embedded container: "
+               + propertiesMetadata.embeddedContainers.get(i));
+      }
+    }
+  }

-  public String getIdKeywordName() {
-    return idKeywordName;
-  }
+  private Object unproxy(Object value)
+  {
+    //FIXME this service should be part of Core?
+    if (value instanceof HibernateProxy)
+    {
+      // .getImplementation() initializes the data by side effect
+      value = ((HibernateProxy) value).getHibernateLazyInitializer()
+           .getImplementation();
+    }
+    return value;
+  }

-  public static Class getDocumentClass(Document document) {
-    String className = document.get( DocumentBuilder.CLASS_FIELDNAME );
-    try {
-      return ReflectHelper.classForName( className );
-    }
-    catch (ClassNotFoundException e) {
-      throw new SearchException( "Unable to load indexed class: " + className, e );
-    }
-  }
+  public Term getTerm(Serializable id)
+  {
+    if (idProvided)
+    {
+      return new Term(idKeywordName, (String) id);
+    }

-  public static Serializable getDocumentId(SearchFactoryImplementor searchFactoryImplementor, Class clazz, Document document) {
-    DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( clazz );
-    if ( builder == null ) throw new SearchException( "No Lucene configuration set up for: " + clazz.getName() );
-    return (Serializable) builder.getIdBridge().get( builder.getIdKeywordName(), document );
-  }
+    return new Term(idKeywordName, idBridge.objectToString(id));
+  }

-  public static Object[] getDocumentFields(SearchFactoryImplementor searchFactoryImplementor, Class clazz, Document document, String[] fields) {
-    DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( clazz );
-    if ( builder == null ) throw new SearchException( "No Lucene configuration set up for: " + clazz.getName() );
-    final int fieldNbr = fields.length;
-    Object[] result = new Object[fieldNbr];
+  public DirectoryProvider[] getDirectoryProviders()
+  {
+    return directoryProviders;
+  }

-    if ( builder.idKeywordName != null ) {
-      populateResult( builder.idKeywordName, builder.idBridge, Field.Store.YES, fields, result, document );
-    }
+  public IndexShardingStrategy getDirectoryProviderSelectionStrategy()
+  {
+    return shardingStrategy;
+  }

-    final PropertiesMetadata metadata = builder.rootPropertiesMetadata;
-    processFieldsForProjection( metadata, fields, result, document );
-    return result;
-  }
+  public Analyzer getAnalyzer()
+  {
+    return analyzer;
+  }

-  private static void processFieldsForProjection(PropertiesMetadata metadata, String[] fields, Object[] result, Document document) {
-    final int nbrFoEntityFields = metadata.fieldNames.size();
-    for (int index = 0; index < nbrFoEntityFields; index++) {
-      populateResult( metadata.fieldNames.get( index ),
-          metadata.fieldBridges.get( index ),
-          metadata.fieldStore.get( index ),
-          fields,
-          result,
-          document
-      );
-    }
-    final int nbrOfEmbeddedObjects = metadata.embeddedPropertiesMetadata.size();
-    for (int index = 0; index < nbrOfEmbeddedObjects; index++) {
-      //there is nothing we can do for collections
-      if ( metadata.embeddedContainers.get( index ) == PropertiesMetadata.Container.OBJECT ) {
-        processFieldsForProjection( metadata.embeddedPropertiesMetadata.get( index ), fields, result, document );
-      }
-    }
-  }
+  private static void setAccessible(XMember member)
+  {
+    if (!Modifier.isPublic(member.getModifiers()))
+    {
+      member.setAccessible(true);
+    }
+  }

-  private static void populateResult(String fieldName, FieldBridge fieldBridge, Field.Store store,
-                    String[] fields, Object[] result, Document document) {
-    int matchingPosition = getFieldPosition( fields, fieldName );
-    if ( matchingPosition != -1 ) {
-      //TODO make use of an isTwoWay() method
-      if ( store != Field.Store.NO && TwoWayFieldBridge.class.isAssignableFrom( fieldBridge.getClass() ) ) {
-        result[matchingPosition] = ( (TwoWayFieldBridge) fieldBridge ).get( fieldName, document );
-        if ( log.isTraceEnabled() ) {
-          log.trace( "Field {} projected as {}", fieldName, result[matchingPosition] );
-        }
-      }
-      else {
-        if ( store == Field.Store.NO ) {
-          throw new SearchException( "Projecting an unstored field: " + fieldName );
-        }
-        else {
-          throw new SearchException( "FieldBridge is not a TwoWayFieldBridge: " + fieldBridge.getClass() );
-        }
-      }
-    }
-  }
+  public TwoWayFieldBridge getIdBridge()
+  {
+    return idBridge;
+  }

-  private static int getFieldPosition(String[] fields, String fieldName) {
-    int fieldNbr = fields.length;
-    for (int index = 0; index < fieldNbr; index++) {
-      if ( fieldName.equals( fields[index] ) ) return index;
-    }
-    return -1;
-  }
+  public String getIdKeywordName()
+  {
+    return idKeywordName;
+  }

-  public void postInitialize(Set<Class> indexedClasses) {
-    //this method does not requires synchronization
-    Class plainClass = reflectionManager.toClass( beanClass );
-    Set<Class> tempMappedSubclasses = new HashSet<Class>();
-    //together with the caller this creates a o(2), but I think it's still faster than create the up hierarchy for each class
-    for (Class currentClass : indexedClasses) {
-      if ( plainClass.isAssignableFrom( currentClass ) ) tempMappedSubclasses.add( currentClass );
-    }
-    this.mappedSubclasses = Collections.unmodifiableSet( tempMappedSubclasses );
-    Class superClass = plainClass.getSuperclass();
-    this.isRoot = true;
-    while ( superClass != null) {
-      if ( indexedClasses.contains( superClass ) ) {
-        this.isRoot = false;
-        break;
-      }
-      superClass = superClass.getSuperclass();
-    }
-  }
+  public static Class getDocumentClass(Document document)
+  {
+    String className = document.get(DocumentBuilder.CLASS_FIELDNAME);
+    try
+    {
+      return ReflectHelper.classForName(className);
+    }
+    catch (ClassNotFoundException e)
+    {
+      throw new SearchException("Unable to load indexed class: " + className, e);
+    }
+  }

+  public static Serializable getDocumentId(SearchFactoryImplementor searchFactoryImplementor, Class clazz, Document document)
+  {
+    DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get(clazz);
+    if (builder == null) throw new SearchException("No Lucene configuration set up for: " + clazz.getName());
+    return (Serializable) builder.getIdBridge().get(builder.getIdKeywordName(), document);
+  }

-  public Set<Class> getMappedSubclasses() {
-    return mappedSubclasses;
-  }
+  public static Object[] getDocumentFields(SearchFactoryImplementor searchFactoryImplementor, Class clazz, Document document, String[] fields)
+  {
+    DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get(clazz);
+    if (builder == null) throw new SearchException("No Lucene configuration set up for: " + clazz.getName());
+    final int fieldNbr = fields.length;
+    Object[] result = new Object[fieldNbr];

-  /**
-   * Make sure to return false if there is a risk of composite id
-   * if composite id, use of (a, b) in ((1,2), (3,4)) fails on most database
-   */
-  public boolean isSafeFromTupleId() {
-    return safeFromTupleId;
-  }
+    if (builder.idKeywordName != null)
+    {
+      populateResult(builder.idKeywordName, builder.idBridge, Field.Store.YES, fields, result, document);
+    }

-  /**
-   * Wrapper class containing all the meta data extracted out of the entities.
-   */
-  private static class PropertiesMetadata {
-    public Float boost;
-    public Analyzer analyzer;
-    public final List<String> fieldNames = new ArrayList<String>();
-    public final List<XMember> fieldGetters = new ArrayList<XMember>();
-    public final List<FieldBridge> fieldBridges = new ArrayList<FieldBridge>();
-    public final List<Field.Store> fieldStore = new ArrayList<Field.Store>();
-    public final List<Field.Index> fieldIndex = new ArrayList<Field.Index>();
-    public final List<Field.TermVector> fieldTermVectors = new ArrayList<Field.TermVector>();
-    public final List<XMember> embeddedGetters = new ArrayList<XMember>();
-    public final List<PropertiesMetadata> embeddedPropertiesMetadata = new ArrayList<PropertiesMetadata>();
-    public final List<Container> embeddedContainers = new ArrayList<Container>();
-    public final List<XMember> containedInGetters = new ArrayList<XMember>();
-    public final List<String> classNames = new ArrayList<String>();
-    public final List<Field.Store> classStores = new ArrayList<Field.Store>();
-    public final List<Field.Index> classIndexes = new ArrayList<Field.Index>();
-    public final List<FieldBridge> classBridges = new ArrayList<FieldBridge>();
-    public final List<Field.TermVector> classTermVectors = new ArrayList<Field.TermVector>();
-    public final List<Float> classBoosts = new ArrayList<Float>();
+    final PropertiesMetadata metadata = builder.rootPropertiesMetadata;
+    processFieldsForProjection(metadata, fields, result, document);
+    return result;
+  }

-    public enum Container {
-      OBJECT,
-      COLLECTION,
-      MAP,
-      ARRAY
-    }
-    
-    private LuceneOptions getClassLuceneOptions(int i) {
-      LuceneOptions options = new LuceneOptions(classStores.get(i),
-          classIndexes.get(i), classTermVectors.get(i), classBoosts.get(i));
-      return options;
-    }
-    
-    private LuceneOptions getFieldLuceneOptions(int i, Float boost) {
-      LuceneOptions options = new LuceneOptions(fieldStore.get(i),
-          fieldIndex.get(i), fieldTermVectors.get(i), boost);
-      return options;
-    }    
-  }
+  private static void processFieldsForProjection(PropertiesMetadata metadata, String[] fields, Object[] result, Document document)
+  {
+    final int nbrFoEntityFields = metadata.fieldNames.size();
+    for (int index = 0; index < nbrFoEntityFields; index++)
+    {
+      populateResult(metadata.fieldNames.get(index),
+           metadata.fieldBridges.get(index),
+           metadata.fieldStore.get(index),
+           fields,
+           result,
+           document
+      );
+    }
+    final int nbrOfEmbeddedObjects = metadata.embeddedPropertiesMetadata.size();
+    for (int index = 0; index < nbrOfEmbeddedObjects; index++)
+    {
+      //there is nothing we can do for collections
+      if (metadata.embeddedContainers.get(index) == PropertiesMetadata.Container.OBJECT)
+      {
+        processFieldsForProjection(metadata.embeddedPropertiesMetadata.get(index), fields, result, document);
+      }
+    }
+  }
+
+  private static void populateResult(String fieldName, FieldBridge fieldBridge, Field.Store store,
+                         String[] fields, Object[] result, Document document)
+  {
+    int matchingPosition = getFieldPosition(fields, fieldName);
+    if (matchingPosition != -1)
+    {
+      //TODO make use of an isTwoWay() method
+      if (store != Field.Store.NO && TwoWayFieldBridge.class.isAssignableFrom(fieldBridge.getClass()))
+      {
+        result[matchingPosition] = ((TwoWayFieldBridge) fieldBridge).get(fieldName, document);
+        if (log.isTraceEnabled())
+        {
+          log.trace("Field {} projected as {}", fieldName, result[matchingPosition]);
+        }
+      }
+      else
+      {
+        if (store == Field.Store.NO)
+        {
+          throw new SearchException("Projecting an unstored field: " + fieldName);
+        }
+        else
+        {
+          throw new SearchException("FieldBridge is not a TwoWayFieldBridge: " + fieldBridge.getClass());
+        }
+      }
+    }
+  }
+
+  private static int getFieldPosition(String[] fields, String fieldName)
+  {
+    int fieldNbr = fields.length;
+    for (int index = 0; index < fieldNbr; index++)
+    {
+      if (fieldName.equals(fields[index])) return index;
+    }
+    return -1;
+  }
+
+  public void postInitialize(Set<Class> indexedClasses)
+  {
+    //this method does not requires synchronization
+    Class plainClass = reflectionManager.toClass(beanClass);
+    Set<Class> tempMappedSubclasses = new HashSet<Class>();
+    //together with the caller this creates a o(2), but I think it's still faster than create the up hierarchy for each class
+    for (Class currentClass : indexedClasses)
+    {
+      if (plainClass.isAssignableFrom(currentClass)) tempMappedSubclasses.add(currentClass);
+    }
+    this.mappedSubclasses = Collections.unmodifiableSet(tempMappedSubclasses);
+    Class superClass = plainClass.getSuperclass();
+    this.isRoot = true;
+    while (superClass != null)
+    {
+      if (indexedClasses.contains(superClass))
+      {
+        this.isRoot = false;
+        break;
+      }
+      superClass = superClass.getSuperclass();
+    }
+  }
+
+
+  public Set<Class> getMappedSubclasses()
+  {
+    return mappedSubclasses;
+  }
+
+  /**
+   * Make sure to return false if there is a risk of composite id
+   * if composite id, use of (a, b) in ((1,2), (3,4)) fails on most database
+   */
+  public boolean isSafeFromTupleId()
+  {
+    return safeFromTupleId;
+  }
+
+  /**
+   * Wrapper class containing all the meta data extracted out of the entities.
+   */
+  private static class PropertiesMetadata
+  {
+    public Float boost;
+    public Analyzer analyzer;
+    public final List<String> fieldNames = new ArrayList<String>();
+    public final List<XMember> fieldGetters = new ArrayList<XMember>();
+    public final List<FieldBridge> fieldBridges = new ArrayList<FieldBridge>();
+    public final List<Field.Store> fieldStore = new ArrayList<Field.Store>();
+    public final List<Field.Index> fieldIndex = new ArrayList<Field.Index>();
+    public final List<Field.TermVector> fieldTermVectors = new ArrayList<Field.TermVector>();
+    public final List<XMember> embeddedGetters = new ArrayList<XMember>();
+    public final List<PropertiesMetadata> embeddedPropertiesMetadata = new ArrayList<PropertiesMetadata>();
+    public final List<Container> embeddedContainers = new ArrayList<Container>();
+    public final List<XMember> containedInGetters = new ArrayList<XMember>();
+    public final List<String> classNames = new ArrayList<String>();
+    public final List<Field.Store> classStores = new ArrayList<Field.Store>();
+    public final List<Field.Index> classIndexes = new ArrayList<Field.Index>();
+    public final List<FieldBridge> classBridges = new ArrayList<FieldBridge>();
+    public final List<Field.TermVector> classTermVectors = new ArrayList<Field.TermVector>();
+    public final List<Float> classBoosts = new ArrayList<Float>();
+
+    public enum Container
+    {