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

Author: sannegrinovero Date: 2010-02-06 07:54:40 -0500 (Sat, 06 Feb 2010) New Revision: 18710 Modified: search/trunk/src/main/java/org/hibernate/search/backend/configuration/MaskedProperty.java search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierProducer.java search/trunk/src/main/java/org/hibernate/search/cfg/FieldBridgeMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/FieldMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/FullTextFilterDefMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/SearchMapping.java search/trunk/src/main/java/org/hibernate/search/impl/SimpleIndexingProgressMonitor.java search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java search/trunk/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java search/trunk/src/main/java/org/hibernate/search/store/RAMDirectoryProvider.java search/trunk/src/main/java/org/hibernate/search/util/ContextHelper.java Log: in preparation for warnings cleanup to solve Lucene 2.9 deprecations: fixing typos, unused imports, unimportant glitches found by findbugs Modified: search/trunk/src/main/java/org/hibernate/search/backend/configuration/MaskedProperty.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -114,7 +114,7 @@ * @throws IllegalArgumentException if the key is not a String instance */ @Override - public boolean containsKey(Object key) { + public synchronized boolean containsKey(Object key) { if ( ! ( key instanceof String ) ) { throw new IllegalArgumentException( "key must be a String" ); } @@ -252,7 +252,7 @@ } @Override - public boolean contains(Object value) { + public synchronized boolean contains(Object value) { initPropertyNames(); return propertyNames.contains( value ); } @@ -291,7 +291,7 @@ } @Override - public boolean isEmpty() { + public synchronized boolean isEmpty() { initPropertyNames(); return propertyNames.isEmpty(); } @@ -300,7 +300,7 @@ * @throws UnsupportedOperationException */ @Override - public Enumeration<Object> keys() { + public synchronized Enumeration<Object> keys() { initPropertyNames(); return Collections.enumeration( propertyNames ); } @@ -347,13 +347,13 @@ * @throws UnsupportedOperationException */ @Override - public int size() { + public synchronized int size() { initPropertyNames(); return propertyNames.size(); } @Override - public String toString() { + public synchronized String toString() { return masked.toString(); } @@ -366,7 +366,7 @@ } @Override - public int hashCode() { + public synchronized int hashCode() { final int prime = 31; int result = ( ( fallBack == null ) ? 0 : fallBack.hashCode() ); result = prime * result + masked.hashCode(); @@ -375,7 +375,7 @@ } @Override - public boolean equals(Object obj) { + public synchronized boolean equals(Object obj) { if ( this == obj ) return true; if ( obj == null ) @@ -394,4 +394,5 @@ return false; return true; } + } Modified: search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -28,7 +28,6 @@ import java.util.Map; import java.util.Properties; import java.util.List; -import java.util.concurrent.ExecutorService; import org.hibernate.search.backend.BackendQueueProcessorFactory; import org.hibernate.search.backend.LuceneWork; Modified: search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierProducer.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierProducer.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierProducer.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -118,7 +118,7 @@ .uniqueResult(); if ( objectsLimit != 0 && objectsLimit < totalCount.intValue() ) { - totalCount = new Long(objectsLimit); + totalCount = Long.valueOf( objectsLimit ); } log.debug( "going to fetch {} primary keys", totalCount); monitor.addToTotalCount( totalCount ); Modified: search/trunk/src/main/java/org/hibernate/search/cfg/FieldBridgeMapping.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/cfg/FieldBridgeMapping.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/cfg/FieldBridgeMapping.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -42,7 +42,7 @@ private final EntityDescriptor entity; private final PropertyDescriptor property; private final FieldMapping fieldMapping; - private final Map<String, Object> bridge = new HashMap<String, Object>();; + private final Map<String, Object> bridge = new HashMap<String, Object>(); public FieldBridgeMapping(Class<?> impl, Map<String, Object> field, FieldMapping fieldMapping, Modified: search/trunk/src/main/java/org/hibernate/search/cfg/FieldMapping.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/cfg/FieldMapping.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/cfg/FieldMapping.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -33,7 +33,6 @@ import org.hibernate.search.annotations.Resolution; import org.hibernate.search.annotations.Store; import org.hibernate.search.annotations.TermVector; -import org.hibernate.search.engine.BoostStrategy; /** * @author Emmanuel Bernard @@ -78,7 +77,6 @@ return this; } - public FieldBridgeMapping bridge(Class<?> impl) { return new FieldBridgeMapping( impl, field, this, property, entity, mapping ); } Modified: search/trunk/src/main/java/org/hibernate/search/cfg/FullTextFilterDefMapping.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/cfg/FullTextFilterDefMapping.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/cfg/FullTextFilterDefMapping.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -24,7 +24,6 @@ */ package org.hibernate.search.cfg; -import java.lang.annotation.ElementType; import java.util.HashMap; import java.util.Map; Modified: search/trunk/src/main/java/org/hibernate/search/cfg/SearchMapping.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/cfg/SearchMapping.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/cfg/SearchMapping.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.Tokenizer; import org.apache.solr.analysis.TokenizerFactory; /** Modified: search/trunk/src/main/java/org/hibernate/search/impl/SimpleIndexingProgressMonitor.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/impl/SimpleIndexingProgressMonitor.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/impl/SimpleIndexingProgressMonitor.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -72,8 +72,8 @@ protected void printStatusMessage(long starttimems, long totalTodoCount, long doneCount) { long elapsedMs = System.currentTimeMillis() - starttimems; log.info( "{} documents indexed in {} ms", doneCount, elapsedMs ); - float estimateSpeed = (float) doneCount * 1000f / elapsedMs ; - float estimatePercentileComplete = (float) doneCount * 100f / (float) totalTodoCount ; + float estimateSpeed = doneCount * 1000f / elapsedMs ; + float estimatePercentileComplete = doneCount * 100f / totalTodoCount ; log.info( "Indexing speed: {} documents/second; progress: {}%", estimateSpeed, estimatePercentileComplete ); } Modified: search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -26,7 +26,6 @@ import java.io.Serializable; import java.util.Map; -import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.FlushModeType; import javax.persistence.LockModeType; Modified: search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -162,13 +162,13 @@ } /** - * Return an interator on the results. + * Return an iterator on the results. * Retrieve the object one by one (initialize it during the next() operation) */ public Iterator iterate() throws HibernateException { - //implement an interator which keep the id/class for each hit and get the object on demand - //cause I can't keep the searcher and hence the hit opened. I dont have any hook to know when the - //user stop using it + //implement an iterator which keep the id/class for each hit and get the object on demand + //cause I can't keep the searcher and hence the hit opened. I don't have any hook to know when the + //user stops using it //scrollable is better in this area //find the directories Modified: search/trunk/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -28,7 +28,7 @@ import java.io.IOException; import java.util.Properties; -import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.analysis.SimpleAnalyzer; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.FSDirectory; @@ -105,14 +105,14 @@ */ public static FSDirectory createFSIndex(File indexDir, Properties dirConfiguration) throws IOException { LockFactory lockFactory = createLockFactory(indexDir, dirConfiguration); - FSDirectory fsDirectory = FSDirectory.getDirectory( indexDir, null ); + FSDirectory fsDirectory = FSDirectory.open( indexDir, null ); // must use the setter (instead of using the constructor) to set the lockFactory, or Lucene will // throw an exception if it's different than a previous setting. fsDirectory.setLockFactory( lockFactory ); if ( ! IndexReader.indexExists( fsDirectory ) ) { log.debug( "Initialize index: '{}'", indexDir.getAbsolutePath() ); IndexWriter.MaxFieldLength fieldLength = new IndexWriter.MaxFieldLength( IndexWriter.DEFAULT_MAX_FIELD_LENGTH ); - IndexWriter iw = new IndexWriter( fsDirectory, new StandardAnalyzer(), true, fieldLength ); + IndexWriter iw = new IndexWriter( fsDirectory, new SimpleAnalyzer(), true, fieldLength ); iw.close(); } return fsDirectory; Modified: search/trunk/src/main/java/org/hibernate/search/store/RAMDirectoryProvider.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/store/RAMDirectoryProvider.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/store/RAMDirectoryProvider.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -27,7 +27,7 @@ import java.io.IOException; import java.util.Properties; -import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.analysis.SimpleAnalyzer; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.RAMDirectory; import org.hibernate.HibernateException; @@ -52,7 +52,7 @@ public void start() { try { IndexWriter.MaxFieldLength fieldLength = new IndexWriter.MaxFieldLength( IndexWriter.DEFAULT_MAX_FIELD_LENGTH ); - IndexWriter iw = new IndexWriter( directory, new StandardAnalyzer(), true, fieldLength ); + IndexWriter iw = new IndexWriter( directory, new SimpleAnalyzer(), true, fieldLength ); iw.close(); } catch (IOException e) { Modified: search/trunk/src/main/java/org/hibernate/search/util/ContextHelper.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/util/ContextHelper.java 2010-02-06 06:33:14 UTC (rev 18709) +++ search/trunk/src/main/java/org/hibernate/search/util/ContextHelper.java 2010-02-06 12:54:40 UTC (rev 18710) @@ -45,7 +45,7 @@ public static SearchFactoryImplementor getSearchFactoryBySFI(SessionImplementor session) { PostInsertEventListener[] listeners = session.getListeners().getPostInsertEventListeners(); FullTextIndexEventListener listener = null; - //FIXME this sucks since we mandante the event listener use + //FIXME this sucks since we mandate the event listener use for ( PostInsertEventListener candidate : listeners ) { if ( candidate instanceof FullTextIndexEventListener ) { listener = (FullTextIndexEventListener) candidate;