[hibernate-commits] Hibernate SVN: r16577 - in search/trunk/src: main/java/org/hibernate/search/cfg and 11 other directories.

Author: sannegrinovero Date: 2009-05-16 06:34:36 -0400 (Sat, 16 May 2009) New Revision: 16577 Modified: search/trunk/src/main/java/org/hibernate/search/Version.java search/trunk/src/main/java/org/hibernate/search/cfg/DocumentIdMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/EntityMapping.java search/trunk/src/main/java/org/hibernate/search/cfg/PropertyDescriptor.java search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java search/trunk/src/test/java/org/hibernate/search/test/TransactionTest.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java search/trunk/src/test/java/org/hibernate/search/test/configuration/ProgrammaticMappingTest.java search/trunk/src/test/java/org/hibernate/search/test/embedded/State.java search/trunk/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java search/trunk/src/test/java/org/hibernate/search/test/inheritance/Animal.java search/trunk/src/test/java/org/hibernate/search/test/inheritance/Being.java search/trunk/src/test/java/org/hibernate/search/test/jms/master/MDBSearchController.java search/trunk/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java search/trunk/src/test/java/org/hibernate/search/test/query/criteria/Bike.java Log: removing dead code, unused imports, set Version to 3.2.0-SNAPSHOT Modified: search/trunk/src/main/java/org/hibernate/search/Version.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/Version.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/main/java/org/hibernate/search/Version.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -1,25 +1,20 @@ //$Id$ package org.hibernate.search; -import java.util.Date; - -import org.slf4j.Logger; - import org.hibernate.search.util.LoggerFactory; - /** * @author Emmanuel Bernard */ public class Version { - public static final String VERSION = "3.1.0.GA"; + + public static final String VERSION = "3.2.0-SNAPSHOT"; - private static final Logger log = LoggerFactory.make(); - static { - log.info( "Hibernate Search {}", VERSION ); + LoggerFactory.make().info( "Hibernate Search {}", VERSION ); } public static void touch() { } + } Modified: search/trunk/src/main/java/org/hibernate/search/cfg/DocumentIdMapping.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/cfg/DocumentIdMapping.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/main/java/org/hibernate/search/cfg/DocumentIdMapping.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -6,10 +6,6 @@ import org.apache.solr.analysis.TokenizerFactory; -import org.hibernate.search.annotations.Index; -import org.hibernate.search.annotations.Store; -import org.hibernate.search.annotations.TermVector; - /** * @author Emmanuel Bernard */ Modified: search/trunk/src/main/java/org/hibernate/search/cfg/EntityMapping.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/cfg/EntityMapping.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/main/java/org/hibernate/search/cfg/EntityMapping.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -6,8 +6,6 @@ import org.apache.solr.analysis.TokenizerFactory; -import org.hibernate.search.annotations.Indexed; - /** * @author Emmanuel Bernard */ Modified: search/trunk/src/main/java/org/hibernate/search/cfg/PropertyDescriptor.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/cfg/PropertyDescriptor.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/main/java/org/hibernate/search/cfg/PropertyDescriptor.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -1,9 +1,7 @@ package org.hibernate.search.cfg; import java.lang.annotation.ElementType; -import java.util.HashSet; import java.util.Map; -import java.util.Set; import java.util.Collection; import java.util.ArrayList; Modified: search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -150,7 +150,6 @@ QueryHits queryHits = getQueryHits( searcher, calculateTopDocsRetrievalSize() ); int first = first(); int max = max( first, queryHits.totalHits ); - Session sess = ( Session ) this.session; int size = max - first + 1 < 0 ? 0 : max - first + 1; List<EntityInfo> infos = new ArrayList<EntityInfo>( size ); @@ -293,7 +292,6 @@ QueryHits queryHits = getQueryHits( searcher, calculateTopDocsRetrievalSize() ); int first = first(); int max = max( first, queryHits.totalHits ); - Session sess = ( Session ) this.session; int size = max - first + 1 < 0 ? 0 : max - first + 1; List<EntityInfo> infos = new ArrayList<EntityInfo>( size ); Modified: search/trunk/src/test/java/org/hibernate/search/test/TransactionTest.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/TransactionTest.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/TransactionTest.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -6,7 +6,6 @@ import org.apache.lucene.index.IndexReader; import org.hibernate.Session; -import org.hibernate.cfg.Configuration; /** * @author Emmanuel Bernard Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -3,7 +3,6 @@ import java.util.HashSet; import java.util.Set; -import javax.print.attribute.HashAttributeSet; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Token; @@ -20,7 +19,6 @@ import org.hibernate.search.SearchFactory; import org.hibernate.search.SearchException; import org.hibernate.search.impl.InitContext; -import org.hibernate.search.cfg.SearchConfiguration; import org.hibernate.search.cfg.SearchConfigurationFromHibernateCore; import org.hibernate.search.engine.DocumentBuilderContainedEntity; import org.hibernate.search.test.SearchTestCase; Modified: search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -1,17 +1,12 @@ // $Id: AbstractTestAnalyzer.java 15547 2008-11-11 12:57:47Z hardy.ferentschik $ package org.hibernate.search.test.analyzer.solr; -import java.io.Reader; import java.io.IOException; -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Token; -import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.TokenFilter; -import org.apache.lucene.search.Filter; +import org.apache.lucene.analysis.TokenStream; - /** * A filter which will actually insert spaces. Most filters/tokenizers remove them, but for testing it is * sometimes better to insert them again ;-) Modified: search/trunk/src/test/java/org/hibernate/search/test/configuration/ProgrammaticMappingTest.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/configuration/ProgrammaticMappingTest.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/configuration/ProgrammaticMappingTest.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -8,7 +8,6 @@ import org.apache.solr.analysis.LowerCaseFilterFactory; import org.apache.solr.analysis.NGramFilterFactory; import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.search.DefaultSimilarity; @@ -21,9 +20,6 @@ import org.hibernate.search.FullTextSession; import org.hibernate.search.Search; import org.hibernate.search.FullTextQuery; -import org.hibernate.search.bridge.builtin.StringBridge; -import org.hibernate.search.store.RAMDirectoryProvider; -import org.hibernate.search.store.FSDirectoryProvider; import org.hibernate.cfg.Configuration; import org.hibernate.Transaction; Modified: search/trunk/src/test/java/org/hibernate/search/test/embedded/State.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/embedded/State.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/embedded/State.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -9,7 +9,6 @@ import org.hibernate.search.annotations.ContainedIn; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; -import org.hibernate.search.annotations.Indexed; /** * @author Hardy Ferentschik Modified: search/trunk/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.BitSet; -import java.util.Collections; import java.util.List; import org.apache.lucene.search.DocIdSet; Modified: search/trunk/src/test/java/org/hibernate/search/test/inheritance/Animal.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/inheritance/Animal.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/inheritance/Animal.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -1,7 +1,6 @@ //$Id$ package org.hibernate.search.test.inheritance; -import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -9,7 +8,6 @@ import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Index; -import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.Store; /** Modified: search/trunk/src/test/java/org/hibernate/search/test/inheritance/Being.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/inheritance/Being.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/inheritance/Being.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -6,7 +6,6 @@ import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Index; import org.hibernate.search.annotations.FieldBridge; -import org.hibernate.search.annotations.Indexed; import org.hibernate.search.test.bridge.PaddedIntegerBridge; /** Modified: search/trunk/src/test/java/org/hibernate/search/test/jms/master/MDBSearchController.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/jms/master/MDBSearchController.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/jms/master/MDBSearchController.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -1,8 +1,6 @@ //$Id$ package org.hibernate.search.test.jms.master; -import javax.jms.MessageListener; - import org.hibernate.search.backend.impl.jms.AbstractJMSHibernateSearchController; import org.hibernate.Session; import org.hibernate.SessionFactory; Modified: search/trunk/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -441,7 +441,7 @@ assertTrue( "Should not trigger projection", result.get( 0 ) instanceof Book ); hibQuery = s.createFullTextQuery( query, Book.class ); - hibQuery.setProjection( null ); + hibQuery.setProjection( (String[]) null ); result = hibQuery.list(); assertNotNull( result ); assertEquals( 1, result.size() ); Modified: search/trunk/src/test/java/org/hibernate/search/test/query/criteria/Bike.java =================================================================== --- search/trunk/src/test/java/org/hibernate/search/test/query/criteria/Bike.java 2009-05-16 09:57:32 UTC (rev 16576) +++ search/trunk/src/test/java/org/hibernate/search/test/query/criteria/Bike.java 2009-05-16 10:34:36 UTC (rev 16577) @@ -1,14 +1,9 @@ //$Id$ package org.hibernate.search.test.query.criteria; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; import org.hibernate.search.annotations.Field;