[hibernate-commits] Hibernate SVN: r14835 - in search/branches/jboss_cache_integration/src/java/org/hibernate/search: engine and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: navssurtani
Date: 2008-07-01 10:18:30 -0400 (Tue, 01 Jul 2008)
New Revision: 14835

Modified:
   search/branches/jboss_cache_integration/src/java/org/hibernate/search/annotations/ProvidedId.java
   search/branches/jboss_cache_integration/src/java/org/hibernate/search/engine/DocumentBuilder.java
Log:
Working on DocBuilder - line 116 needs to be fixed

Modified: search/branches/jboss_cache_integration/src/java/org/hibernate/search/annotations/ProvidedId.java
===================================================================
--- search/branches/jboss_cache_integration/src/java/org/hibernate/search/annotations/ProvidedId.java	2008-07-01 13:33:38 UTC (rev 14834)
+++ search/branches/jboss_cache_integration/src/java/org/hibernate/search/annotations/ProvidedId.java	2008-07-01 14:18:30 UTC (rev 14835)
@@ -14,4 +14,7 @@
 @Documented
 public @interface ProvidedId
 {
+
+   String name() default "JBCS_ProvidedId";
+   FieldBridge bridge() default @FieldBridge(impl=org.hibernate.search.bridge.builtin.StringBridge.class);
 }

Modified: search/branches/jboss_cache_integration/src/java/org/hibernate/search/engine/DocumentBuilder.java
===================================================================
--- search/branches/jboss_cache_integration/src/java/org/hibernate/search/engine/DocumentBuilder.java	2008-07-01 13:33:38 UTC (rev 14834)
+++ search/branches/jboss_cache_integration/src/java/org/hibernate/search/engine/DocumentBuilder.java	2008-07-01 14:18:30 UTC (rev 14835)
@@ -104,15 +104,17 @@
       if (idKeywordName == null)
       {
          // if no DocumentId then check if we have a ProvidedId instead
-         if (clazz.getAnnotation(ProvidedId.class) == null)
+
+         ProvidedId provided = clazz.getAnnotation(ProvidedId.class);
+
+         if (provided == null)
          {
             throw new SearchException("No document id in: " + clazz.getName());
          }
          else
          {
-            // DON'T throw an exception.  This is OK.
-            idProvided = true;
-            idKeywordName = "ThisIsAProvidedId";
+            idBridge = provided.bridge();
+            idKeywordName = provided.name();
          }
       }
       else