[hibernate-commits] Hibernate SVN: r17204 - in search/trunk/src: main/java/org/hibernate/search/backend/impl/lucene and 4 other directories.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-07-27 06:23:54 -0400 (Mon, 27 Jul 2009)
New Revision: 17204

Modified:
   search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/BatchBackend.java
   search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/DirectoryProviderWorkspace.java
   search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/LuceneBatchBackend.java
   search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/PerDirectoryWorkProcessor.java
   search/trunk/src/main/java/org/hibernate/search/batchindexing/BatchCoordinator.java
   search/trunk/src/main/java/org/hibernate/search/filter/FullTextFilterImplementor.java
   search/trunk/src/main/java/org/hibernate/search/filter/ShardSensitiveOnlyFilter.java
   search/trunk/src/test/java/org/hibernate/search/test/bridge/EquipmentType.java
   search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategy.java
   search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategyTest.java
   search/trunk/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java
   search/trunk/src/test/java/org/hibernate/search/test/shards/Email.java
   search/trunk/src/test/java/org/hibernate/search/test/shards/SpecificShardingStrategy.java
Log:
Applied svn:keywords
Formatting

Modified: search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/BatchBackend.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/BatchBackend.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/BatchBackend.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,3 +1,4 @@
+//$Id$
 package org.hibernate.search.backend.impl.batchlucene;
 
 import java.util.Properties;


Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/BatchBackend.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/DirectoryProviderWorkspace.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/DirectoryProviderWorkspace.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/DirectoryProviderWorkspace.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,3 +1,4 @@
+//$Id$
 package org.hibernate.search.backend.impl.batchlucene;
 
 import java.util.concurrent.ExecutorService;


Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/DirectoryProviderWorkspace.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/LuceneBatchBackend.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/LuceneBatchBackend.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/LuceneBatchBackend.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,3 +1,4 @@
+//$Id$
 package org.hibernate.search.backend.impl.batchlucene;
 
 import java.util.HashMap;


Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/batchlucene/LuceneBatchBackend.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/PerDirectoryWorkProcessor.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/PerDirectoryWorkProcessor.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/PerDirectoryWorkProcessor.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,3 +1,4 @@
+//$Id$
 package org.hibernate.search.backend.impl.lucene;
 
 import org.hibernate.search.backend.LuceneWork;


Property changes on: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/PerDirectoryWorkProcessor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/main/java/org/hibernate/search/batchindexing/BatchCoordinator.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/batchindexing/BatchCoordinator.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/main/java/org/hibernate/search/batchindexing/BatchCoordinator.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,3 +1,4 @@
+//$Id$
 package org.hibernate.search.batchindexing;
 
 import java.util.Set;


Property changes on: search/trunk/src/main/java/org/hibernate/search/batchindexing/BatchCoordinator.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/main/java/org/hibernate/search/filter/FullTextFilterImplementor.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/filter/FullTextFilterImplementor.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/main/java/org/hibernate/search/filter/FullTextFilterImplementor.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,3 +1,4 @@
+//$Id$
 package org.hibernate.search.filter;
 
 import org.hibernate.search.FullTextFilter;
@@ -7,7 +8,7 @@
  */
 public interface FullTextFilterImplementor extends FullTextFilter {
 	/**
-	 * Returns the Filter name
+	 * @return Returns the Filter name
 	 */
 	String getName();
 


Property changes on: search/trunk/src/main/java/org/hibernate/search/filter/FullTextFilterImplementor.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/main/java/org/hibernate/search/filter/ShardSensitiveOnlyFilter.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/filter/ShardSensitiveOnlyFilter.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/main/java/org/hibernate/search/filter/ShardSensitiveOnlyFilter.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,3 +1,4 @@
+//$Id$
 package org.hibernate.search.filter;
 
 /**


Property changes on: search/trunk/src/main/java/org/hibernate/search/filter/ShardSensitiveOnlyFilter.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/test/java/org/hibernate/search/test/bridge/EquipmentType.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/bridge/EquipmentType.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/test/java/org/hibernate/search/test/bridge/EquipmentType.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -5,6 +5,7 @@
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
+
 import org.hibernate.search.bridge.FieldBridge;
 import org.hibernate.search.bridge.LuceneOptions;
 import org.hibernate.search.bridge.ParameterizedBridge;
@@ -26,18 +27,17 @@
 		// from the name field of the ClassBridge Annotation. This is not
 		// a requirement. It just works that way in this instance. The
 		// actual name could be supplied by hard coding it below.
-		Departments deps = (Departments) value;
-		Field field = null;
+		Departments deps = ( Departments ) value;
+		Field field;
 		String fieldValue1 = deps.getManufacturer();
 
-		if ( fieldValue1 == null ) {
-			fieldValue1 = "";
-		}
-		else {
-			String fieldValue = (String) equips.get( fieldValue1 );
-			field = new Field( name, fieldValue, luceneOptions.getStore(), luceneOptions.getIndex(), luceneOptions.getTermVector() );
+		if ( fieldValue1 != null ) {
+			String fieldValue = ( String ) equips.get( fieldValue1 );
+			field = new Field(
+					name, fieldValue, luceneOptions.getStore(), luceneOptions.getIndex(), luceneOptions.getTermVector()
+			);
 			field.setBoost( luceneOptions.getBoost() );
+			document.add( field );
 		}
-		document.add( field );
 	}
 }

Modified: search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategy.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategy.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategy.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,3 +1,4 @@
+//$Id$
 package org.hibernate.search.test.shards;
 
 import java.io.Serializable;


Property changes on: search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategy.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategyTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategyTest.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategyTest.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,3 +1,4 @@
+//$Id$
 package org.hibernate.search.test.shards;
 
 import junit.framework.TestCase;


Property changes on: search/trunk/src/test/java/org/hibernate/search/test/shards/CustomerShardingStrategyTest.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,27 +1,22 @@
-// $Id: ShardsTest.java 16210 2009-03-25 10:07:47Z hardy.ferentschik $
+// $Id$
 package org.hibernate.search.test.shards;
 
 import java.io.File;
 import java.util.List;
 
-import org.hibernate.search.test.SearchTestCase;
-import org.hibernate.search.util.FileHelper;
-import org.hibernate.search.store.RAMDirectoryProvider;
-import org.hibernate.search.store.FSDirectoryProvider;
-import org.hibernate.search.store.IdHashShardingStrategy;
-import org.hibernate.search.store.DirectoryProvider;
+import org.apache.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.queryParser.QueryParser;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.cfg.Configuration;
 import org.hibernate.search.Environment;
 import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.TermDocs;
-import org.apache.lucene.index.Term;
+import org.hibernate.search.store.FSDirectoryProvider;
+import org.hibernate.search.test.SearchTestCase;
+import org.hibernate.search.util.FileHelper;
 
 /**
  * @author Chase Seibert


Property changes on: search/trunk/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/test/java/org/hibernate/search/test/shards/Email.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/shards/Email.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/test/java/org/hibernate/search/test/shards/Email.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,3 +1,4 @@
+//$Id$
 package org.hibernate.search.test.shards;
 
 import javax.persistence.Entity;
@@ -6,7 +7,6 @@
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.FullTextFilterDef;
-import org.hibernate.search.annotations.FullTextFilterDefs;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.filter.ShardSensitiveOnlyFilter;
 


Property changes on: search/trunk/src/test/java/org/hibernate/search/test/shards/Email.java
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: search/trunk/src/test/java/org/hibernate/search/test/shards/SpecificShardingStrategy.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/shards/SpecificShardingStrategy.java	2009-07-27 10:22:32 UTC (rev 17203)
+++ search/trunk/src/test/java/org/hibernate/search/test/shards/SpecificShardingStrategy.java	2009-07-27 10:23:54 UTC (rev 17204)
@@ -1,9 +1,6 @@
+//$Id$
 package org.hibernate.search.test.shards;
 
-import java.io.Serializable;
-import java.util.Properties;
-
-import org.apache.lucene.document.Document;
 import org.hibernate.search.FullTextFilter;
 import org.hibernate.search.filter.FullTextFilterImplementor;
 import org.hibernate.search.store.DirectoryProvider;


Property changes on: search/trunk/src/test/java/org/hibernate/search/test/shards/SpecificShardingStrategy.java
___________________________________________________________________
Name: svn:keywords
   + Id