[hibernate-commits] Hibernate SVN: r20837 - in search/trunk/hibernate-search/src: main/java/org/hibernate/search/spi and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2010-10-14 13:33:31 -0400 (Thu, 14 Oct 2010)
New Revision: 20837

Modified:
   search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java
   search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/SearchFactoryBuilder.java
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/configuration/mutablefactory/MutableFactoryTest.java
Log:
HSEARCH-555 Properly expose as public API the SearchFactoryBuilder

Rename SearchFactoryBuilder#rootFactory to SearchFactoryBuilder#currentFactory

Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java	2010-10-14 17:32:43 UTC (rev 20836)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MutableSearchFactory.java	2010-10-14 17:33:31 UTC (rev 20837)
@@ -232,7 +232,7 @@
 
 	public void addClasses(Class<?>... classes) {
 		//todo optimize the list of
-		final SearchFactoryBuilder builder = new SearchFactoryBuilder().rootFactory( this );
+		final SearchFactoryBuilder builder = new SearchFactoryBuilder().currentFactory( this );
 		for ( Class<?> type : classes ) {
 			builder.addClass( type );
 		}

Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/SearchFactoryBuilder.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/SearchFactoryBuilder.java	2010-10-14 17:32:43 UTC (rev 20836)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/SearchFactoryBuilder.java	2010-10-14 17:33:31 UTC (rev 20837)
@@ -118,7 +118,7 @@
 		return this;
 	}
 
-	public SearchFactoryBuilder rootFactory(SearchFactoryIntegrator factory) {
+	public SearchFactoryBuilder currentFactory(SearchFactoryIntegrator factory) {
 		//We know that the only expected concrete type is MutableSearchFactory
 		//This could fail if some fancy framework proxy the object but at this stage they likely won't
 		//even proxy SearchFactoryIntegrator.

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/configuration/mutablefactory/MutableFactoryTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/configuration/mutablefactory/MutableFactoryTest.java	2010-10-14 17:32:43 UTC (rev 20836)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/configuration/mutablefactory/MutableFactoryTest.java	2010-10-14 17:33:31 UTC (rev 20837)
@@ -72,7 +72,7 @@
 		//FIXME downcasting of MSF. create a getDelegate() ?
 		SearchFactoryIntegrator sf = new SearchFactoryBuilder().configuration( configuration ).buildSearchFactory();
 		final SearchFactoryBuilder builder = new SearchFactoryBuilder();
-		sf = builder.rootFactory( sf )
+		sf = builder.currentFactory( sf )
 				.addClass( A.class )
 				.buildSearchFactory();
 
@@ -94,7 +94,7 @@
 
 		searcher.close();
 
-		sf = (MutableSearchFactory) builder.rootFactory( sf )
+		sf = (MutableSearchFactory) builder.currentFactory( sf )
 				.addClass( B.class )
 				.buildSearchFactory();