[hibernate-commits] Hibernate SVN: r11179 - in branches/Branch_3_2/HibernateExt/search/src: java/org/hibernate/search/backend and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2007-02-09 16:19:56 -0500 (Fri, 09 Feb 2007)
New Revision: 11179

Modified:
   branches/Branch_3_2/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java
   branches/Branch_3_2/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java
   branches/Branch_3_2/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java
Log:
HSEARCH-1 Add access to DP from searchFactory

Modified: branches/Branch_3_2/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java
===================================================================
--- branches/Branch_3_2/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java	2007-02-09 15:43:15 UTC (rev 11178)
+++ branches/Branch_3_2/HibernateExt/search/src/java/org/hibernate/search/SearchFactory.java	2007-02-09 21:19:56 UTC (rev 11179)
@@ -119,18 +119,10 @@
 		return documentBuilders;
 	}
 
-	public void setDocumentBuilders(Map<Class, DocumentBuilder<Object>> documentBuilders) {
-		this.documentBuilders = documentBuilders;
-	}
-
 	public Map<DirectoryProvider, ReentrantLock> getLockableDirectoryProviders() {
 		return lockableDirectoryProviders;
 	}
 
-	public void setLockableDirectoryProviders(Map<DirectoryProvider, ReentrantLock> lockableDirectoryProviders) {
-		this.lockableDirectoryProviders = lockableDirectoryProviders;
-	}
-
 	public Worker getWorker() {
 		return worker;
 	}
@@ -151,4 +143,9 @@
 		}
 		return reflectionManager;
 	}
+
+	public DirectoryProvider getDirectoryProvider(Class entity) {
+		DocumentBuilder<Object> documentBuilder = getDocumentBuilders().get( entity );
+		return documentBuilder == null ? null : documentBuilder.getDirectoryProvider();
+	}
 }

Modified: branches/Branch_3_2/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java
===================================================================
--- branches/Branch_3_2/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java	2007-02-09 15:43:15 UTC (rev 11178)
+++ branches/Branch_3_2/HibernateExt/search/src/java/org/hibernate/search/backend/Workspace.java	2007-02-09 21:19:56 UTC (rev 11179)
@@ -48,7 +48,7 @@
 
 	public IndexReader getIndexReader(Class entity) {
 		//TODO NPEs
-		DirectoryProvider provider = searchFactory.getDocumentBuilders().get( entity ).getDirectoryProvider();
+		DirectoryProvider provider = searchFactory.getDirectoryProvider( entity );
 		//one cannot access a reader for update after a writer has been accessed
 		if ( writers.containsKey( provider ) )
 			throw new AssertionFailure("Tries to read for update a index while a writer is accessed" + entity);
@@ -66,7 +66,7 @@
 	}
 
 	public IndexWriter getIndexWriter(Class entity) {
-		DirectoryProvider provider = searchFactory.getDocumentBuilders().get( entity ).getDirectoryProvider();
+		DirectoryProvider provider = searchFactory.getDirectoryProvider( entity );
 		//one has to close a reader for update before a writer is accessed
 		IndexReader reader = readers.get( provider );
 		if ( reader != null ) {

Modified: branches/Branch_3_2/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java
===================================================================
--- branches/Branch_3_2/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java	2007-02-09 15:43:15 UTC (rev 11178)
+++ branches/Branch_3_2/HibernateExt/search/src/test/org/hibernate/search/test/SearchTestCase.java	2007-02-09 21:19:56 UTC (rev 11179)
@@ -22,7 +22,7 @@
 	}
 
 	protected Directory getDirectory(Class clazz) {
-		return getLuceneEventListener().getSearchFactory().getDocumentBuilders().get( clazz ).getDirectoryProvider().getDirectory();
+		return getLuceneEventListener().getSearchFactory().getDirectoryProvider( clazz ).getDirectory();
 	}
 
 	private FullTextIndexEventListener getLuceneEventListener() {