[hibernate-commits] Hibernate SVN: r15165 - in search/trunk/src: java/org/hibernate/search/engine and 2 other directories.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2008-09-09 14:59:28 -0400 (Tue, 09 Sep 2008)
New Revision: 15165

Modified:
   search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java
   search/trunk/src/java/org/hibernate/search/engine/FilterDef.java
   search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java
   search/trunk/src/test/org/hibernate/search/test/filter/Driver.java
Log:
HSEARCH-260 @FulltextFilterDef.cache is now one single paramenter enum based
HSEARCH-259 fitlers are now isolated by name in the cache

Modified: search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java	2008-09-09 18:46:44 UTC (rev 15164)
+++ search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java	2008-09-09 18:59:28 UTC (rev 15165)
@@ -37,5 +37,5 @@
 	/**
 	 * Cache mode for the filter. Default to instance and results caching
 	 */
-	FilterCacheModeType cache() default FilterCacheModeType.INSTANCE_AND_RESULTS;
+	FilterCacheModeType cache() default FilterCacheModeType.INSTANCE_AND_BITSETRESULTS;
 }

Modified: search/trunk/src/java/org/hibernate/search/engine/FilterDef.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/FilterDef.java	2008-09-09 18:46:44 UTC (rev 15164)
+++ search/trunk/src/java/org/hibernate/search/engine/FilterDef.java	2008-09-09 18:59:28 UTC (rev 15165)
@@ -7,7 +7,6 @@
 import java.util.Map;
 
 import org.hibernate.search.SearchException;
-import org.hibernate.search.annotations.CacheBitResults;
 import org.hibernate.search.annotations.FilterCacheModeType;
 import org.hibernate.search.annotations.FullTextFilterDef;
 

Modified: search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java	2008-09-09 18:46:44 UTC (rev 15164)
+++ search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java	2008-09-09 18:59:28 UTC (rev 15165)
@@ -13,7 +13,7 @@
 		switch ( type ) {
 			case NO:
 				return false;
-			case INSTANCE_AND_RESULTS:
+			case INSTANCE_AND_BITSETRESULTS:
 				return true;
 			case INSTANCE_ONLY:
 				return true;
@@ -26,7 +26,7 @@
 		switch ( type ) {
 			case NO:
 				return false;
-			case INSTANCE_AND_RESULTS:
+			case INSTANCE_AND_BITSETRESULTS:     
 				return true;
 			case INSTANCE_ONLY:
 				return false;

Modified: search/trunk/src/test/org/hibernate/search/test/filter/Driver.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/filter/Driver.java	2008-09-09 18:46:44 UTC (rev 15164)
+++ search/trunk/src/test/org/hibernate/search/test/filter/Driver.java	2008-09-09 18:59:28 UTC (rev 15165)
@@ -22,8 +22,8 @@
 @Indexed
 @FullTextFilterDefs( {
 		@FullTextFilterDef(name = "bestDriver", impl = BestDriversFilter.class, cache = FilterCacheModeType.NO), //actual Filter implementation
-		@FullTextFilterDef(name = "security", impl = SecurityFilterFactory.class, cache = FilterCacheModeType.INSTANCE_AND_RESULTS), //Filter factory with parameters
-		@FullTextFilterDef(name = "cacheresultstest", impl = ExcludeAllFilterFactory.class, cache = FilterCacheModeType.INSTANCE_AND_RESULTS),
+		@FullTextFilterDef(name = "security", impl = SecurityFilterFactory.class, cache = FilterCacheModeType.INSTANCE_AND_BITSETRESULTS), //Filter factory with parameters
+		@FullTextFilterDef(name = "cacheresultstest", impl = ExcludeAllFilterFactory.class, cache = FilterCacheModeType.INSTANCE_AND_BITSETRESULTS),
 		@FullTextFilterDef(name = "cacheinstancetest", impl = InstanceBasedExcludeAllFilter.class, cache = FilterCacheModeType.INSTANCE_ONLY)
 })
 public class Driver {