[hibernate-commits] Hibernate SVN: r14845 - in search/trunk/src: java/org/hibernate/search/event and 14 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Thu Jul 3 08:41:06 EDT 2008
Author: hardy.ferentschik
Date: 2008-07-03 08:41:06 -0400 (Thu, 03 Jul 2008)
New Revision: 14845
Modified:
search/trunk/src/java/org/hibernate/search/Search.java
search/trunk/src/java/org/hibernate/search/event/FullTextIndexCollectionEventListener.java
search/trunk/src/java/org/hibernate/search/jpa/Search.java
search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java
search/trunk/src/test/org/hibernate/search/test/PurgeTest.java
search/trunk/src/test/org/hibernate/search/test/RamDirectoryTest.java
search/trunk/src/test/org/hibernate/search/test/analyzer/AnalyzerTest.java
search/trunk/src/test/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java
search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java
search/trunk/src/test/org/hibernate/search/test/bridge/ClassBridgeTest.java
search/trunk/src/test/org/hibernate/search/test/configuration/ConfigurationReadTestCase.java
search/trunk/src/test/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java
search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java
search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/DoubleInsertEmbeddedTest.java
search/trunk/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java
search/trunk/src/test/org/hibernate/search/test/filter/FilterTest.java
search/trunk/src/test/org/hibernate/search/test/id/EmbeddedIdTest.java
search/trunk/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java
Log:
HSEARCH-215
* First part of refactoring. Renamed org.hibernate.search.Search.createFullTextSession into getFullTextSession. Same might be required for org.hibernate.search.jpa.Search
Modified: search/trunk/src/java/org/hibernate/search/Search.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/Search.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/java/org/hibernate/search/Search.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -5,15 +5,17 @@
import org.hibernate.search.impl.FullTextSessionImpl;
/**
- * Helper class to get a FullTextSession out of a regular session
+ * Helper class to get a FullTextSession out of a regular session.
+ *
* @author Emmanuel Bernard
+ * @author Hardy Ferentschik
*/
public final class Search {
private Search() {
}
- public static FullTextSession createFullTextSession(Session session) {
+ public static FullTextSession getFullTextSession(Session session) {
if (session instanceof FullTextSessionImpl) {
return (FullTextSession) session;
}
@@ -21,4 +23,12 @@
return new FullTextSessionImpl(session);
}
}
+
+ /**
+ * @deprecated As of release 3.1.0, replaced by {@link #getFullTextSession(Session)}
+ */
+ @Deprecated
+ public static FullTextSession createFullTextSession(Session session) {
+ return getFullTextSession(session);
+ }
}
\ No newline at end of file
Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexCollectionEventListener.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/event/FullTextIndexCollectionEventListener.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexCollectionEventListener.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -1,4 +1,4 @@
-//$
+// $Id:$
package org.hibernate.search.event;
import java.io.Serializable;
Modified: search/trunk/src/java/org/hibernate/search/jpa/Search.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/jpa/Search.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/java/org/hibernate/search/jpa/Search.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -9,8 +9,10 @@
* Helper class that should be used when building a FullTextEntityManager
*
* @author Emmanuel Bernard
+ * @author Hardy Ferentschik
*/
public final class Search {
+
private Search() {
}
Modified: search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -34,7 +34,7 @@
throw new SearchException("Trying to use Hibernate Search without an Hibernate EntityManager (no delegate)");
}
else if ( Session.class.isAssignableFrom( delegate.getClass() ) ) {
- ftSession = Search.createFullTextSession( (Session) delegate );
+ ftSession = Search.getFullTextSession( (Session) delegate );
}
else if ( EntityManager.class.isAssignableFrom( delegate.getClass() ) ) {
//Some app servers wrap the EM twice
@@ -43,7 +43,7 @@
throw new SearchException("Trying to use Hibernate Search without an Hibernate EntityManager (no delegate)");
}
else if ( Session.class.isAssignableFrom( delegate.getClass() ) ) {
- ftSession = Search.createFullTextSession( (Session) delegate );
+ ftSession = Search.getFullTextSession( (Session) delegate );
}
else {
throw new SearchException("Trying to use Hibernate Search without an Hibernate EntityManager: " + delegate.getClass() );
Modified: search/trunk/src/test/org/hibernate/search/test/PurgeTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/PurgeTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/PurgeTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -22,7 +22,7 @@
public class PurgeTest extends SearchTestCase {
public void testPurge() throws Exception {
- FullTextSession s = Search.createFullTextSession( openSession() );
+ FullTextSession s = Search.getFullTextSession( openSession() );
Transaction tx = s.beginTransaction();
org.hibernate.search.test.query.Clock clock = new Clock( 1, "Seiko" );
s.save( clock );
@@ -62,7 +62,7 @@
}
public void testPurgeAll() throws Exception {
- FullTextSession s = Search.createFullTextSession( openSession() );
+ FullTextSession s = Search.getFullTextSession( openSession() );
Transaction tx = s.beginTransaction();
org.hibernate.search.test.query.Clock clock = new Clock( 1, "Seiko" );
s.save( clock );
Modified: search/trunk/src/test/org/hibernate/search/test/RamDirectoryTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/RamDirectoryTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/RamDirectoryTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -34,9 +34,9 @@
s.getTransaction().begin();
TermQuery q = new TermQuery(new Term("alt_title", "hibernate"));
assertEquals( "does not properly filter", 0,
- Search.createFullTextSession( s ).createFullTextQuery( q, Document.class ).list().size() );
+ Search.getFullTextSession( s ).createFullTextQuery( q, Document.class ).list().size() );
assertEquals( "does not properly filter", 1,
- Search.createFullTextSession( s ).createFullTextQuery( q, Document.class, AlternateDocument.class ).list().size() );
+ Search.getFullTextSession( s ).createFullTextQuery( q, Document.class, AlternateDocument.class ).list().size() );
s.delete( s.get( AlternateDocument.class, document.getId() ) );
s.getTransaction().commit();
s.close();
Modified: search/trunk/src/test/org/hibernate/search/test/analyzer/AnalyzerTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/analyzer/AnalyzerTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/analyzer/AnalyzerTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -21,7 +21,7 @@
en.setProperty( "Property" );
en.setComponent( new MyComponent() );
en.getComponent().setComponentProperty( "component property" );
- FullTextSession s = Search.createFullTextSession( openSession() );
+ FullTextSession s = Search.getFullTextSession( openSession() );
Transaction tx = s.beginTransaction();
s.persist( en );
tx.commit();
Modified: search/trunk/src/test/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -16,7 +16,7 @@
team.setDescription( "This is a D\u00E0scription" );
team.setLocation( "Atlanta" );
team.setName( "ATL team" );
- FullTextSession fts = Search.createFullTextSession( openSession() );
+ FullTextSession fts = Search.getFullTextSession( openSession() );
Transaction tx = fts.beginTransaction();
fts.persist( team );
tx.commit();
Modified: search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -53,7 +53,7 @@
tx.commit();
tx = s.beginTransaction();
- FullTextSession session = Search.createFullTextSession(s);
+ FullTextSession session = Search.getFullTextSession(s);
QueryParser parser = new QueryParser("id", new StandardAnalyzer() );
Query query;
List result;
@@ -101,7 +101,7 @@
tx.commit();
tx = s.beginTransaction();
- FullTextSession session = Search.createFullTextSession(s);
+ FullTextSession session = Search.getFullTextSession(s);
QueryParser parser = new QueryParser("id", new SimpleAnalyzer() );
Query query;
List result;
@@ -143,7 +143,7 @@
tx.commit();
tx = s.beginTransaction();
- FullTextSession session = Search.createFullTextSession(s);
+ FullTextSession session = Search.getFullTextSession(s);
QueryParser parser = new QueryParser("id", new StandardAnalyzer() );
Query query;
List result;
Modified: search/trunk/src/test/org/hibernate/search/test/bridge/ClassBridgeTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/bridge/ClassBridgeTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/ClassBridgeTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -39,7 +39,7 @@
tx.commit();
tx = s.beginTransaction();
- FullTextSession session = Search.createFullTextSession( s );
+ FullTextSession session = Search.getFullTextSession( s );
// The equipment field is the manufacturer field in the
// Departments entity after being massaged by passing it
@@ -107,7 +107,7 @@
tx.commit();
tx = s.beginTransaction();
- FullTextSession session = Search.createFullTextSession( s );
+ FullTextSession session = Search.getFullTextSession( s );
// The equipment field is the manufacturer field in the
// Departments entity after being massaged by passing it
@@ -173,7 +173,7 @@
tx.commit();
tx = s.beginTransaction();
- FullTextSession session = Search.createFullTextSession( s );
+ FullTextSession session = Search.getFullTextSession( s );
// The branchnetwork field is the concatenation of both
// the branch field and the network field of the Department
Modified: search/trunk/src/test/org/hibernate/search/test/configuration/ConfigurationReadTestCase.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/configuration/ConfigurationReadTestCase.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/configuration/ConfigurationReadTestCase.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -29,7 +29,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- FullTextSession fullTextSession = Search.createFullTextSession( openSession() );
+ FullTextSession fullTextSession = Search.getFullTextSession( openSession() );
searchFactory = (SearchFactoryImpl) fullTextSession.getSearchFactory();
fullTextSession.close();
FileHelper.delete( INDEX_DIR );
Modified: search/trunk/src/test/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -26,7 +26,7 @@
sn.setDate( new Date() );
sn.setLocation( "Dallas, TX, USA");
- FullTextSession fts2 = Search.createFullTextSession( getSessionFactories()[1].openSession( ) );
+ FullTextSession fts2 = Search.getFullTextSession( getSessionFactories()[1].openSession( ) );
QueryParser parser = new QueryParser("id", new StopAnalyzer() );
List result = fts2.createFullTextQuery( parser.parse( "location:texas" ) ).list();
assertEquals( "No copy yet, fresh index expected", 0, result.size() );
@@ -41,11 +41,11 @@
Thread.sleep( waitPeroid );
//temp test original
- fts2 = Search.createFullTextSession( getSessionFactories()[0].openSession( ) );
+ fts2 = Search.getFullTextSession( getSessionFactories()[0].openSession( ) );
result = fts2.createFullTextQuery( parser.parse( "location:dallas" ) ).list();
assertEquals( "Original should get one", 1, result.size() );
- fts2 = Search.createFullTextSession( getSessionFactories()[1].openSession( ) );
+ fts2 = Search.getFullTextSession( getSessionFactories()[1].openSession( ) );
result = fts2.createFullTextQuery( parser.parse( "location:dallas" ) ).list();
assertEquals("First copy did not work out", 1, result.size() );
@@ -62,7 +62,7 @@
Thread.sleep( waitPeroid ); //wait a bit more than 2 refresh (one master / one slave)
- fts2 = Search.createFullTextSession( getSessionFactories()[1].openSession( ) );
+ fts2 = Search.getFullTextSession( getSessionFactories()[1].openSession( ) );
result = fts2.createFullTextQuery( parser.parse( "location:chennai" ) ).list();
assertEquals("Second copy did not work out", 1, result.size() );
@@ -79,7 +79,7 @@
Thread.sleep( waitPeroid ); //wait a bit more than 2 refresh (one master / one slave)
- fts2 = Search.createFullTextSession( getSessionFactories()[1].openSession( ) );
+ fts2 = Search.getFullTextSession( getSessionFactories()[1].openSession( ) );
result = fts2.createFullTextQuery( parser.parse( "location:melbourne" ) ).list();
assertEquals("Third copy did not work out", 1, result.size() );
Modified: search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -47,7 +47,7 @@
tx.commit();
- FullTextSession session = Search.createFullTextSession( s );
+ FullTextSession session = Search.getFullTextSession( s );
QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
Query query;
List result;
@@ -78,7 +78,7 @@
s.clear();
- session = Search.createFullTextSession( s );
+ session = Search.getFullTextSession( s );
query = parser.parse( "address.ownedBy_name:buckhead" );
result = session.createFullTextQuery( query, Tower.class ).list();
@@ -115,7 +115,7 @@
tx.commit();
- FullTextSession session = Search.createFullTextSession( s );
+ FullTextSession session = Search.getFullTextSession( s );
QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
Query query;
List result;
@@ -152,7 +152,7 @@
s.clear();
- FullTextSession session = Search.createFullTextSession( s );
+ FullTextSession session = Search.getFullTextSession( s );
QueryParser parser = new QueryParser( "id", new StandardAnalyzer() );
Query query;
List result;
@@ -172,7 +172,7 @@
s.clear();
- session = Search.createFullTextSession( s );
+ session = Search.getFullTextSession( s );
query = parser.parse( "address.street:peachtree" );
result = session.createFullTextQuery( query, Tower.class ).list();
@@ -228,7 +228,7 @@
s.clear();
- FullTextSession session = Search.createFullTextSession( s );
+ FullTextSession session = Search.getFullTextSession( s );
tx = session.beginTransaction();
QueryParser parser = new MultiFieldQueryParser( new String[] { "name", "authors.name" }, new StandardAnalyzer() );
@@ -256,7 +256,7 @@
s.clear();
tx = s.beginTransaction();
- session = Search.createFullTextSession( s );
+ session = Search.getFullTextSession( s );
query = parser.parse( "Proust" );
result = session.createFullTextQuery( query, Product.class ).list();
//HSEARCH-56
Modified: search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/DoubleInsertEmbeddedTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/DoubleInsertEmbeddedTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/doubleinsert/DoubleInsertEmbeddedTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -44,14 +44,14 @@
contact.addAddressToContact( address );
contact.addPhoneToContact( phone );
- FullTextSession s = Search.createFullTextSession( openSession( ) );
+ FullTextSession s = Search.getFullTextSession( openSession( ) );
s.getTransaction().begin();
s.save( contact);
s.getTransaction().commit();
s.close();
- s = Search.createFullTextSession( openSession( ) );
+ s = Search.getFullTextSession( openSession( ) );
s.getTransaction().begin();
Term term = new Term("county", "county");
TermQuery termQuery = new TermQuery( term );
Modified: search/trunk/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/fieldAccess/FieldAccessTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -25,7 +25,7 @@
s.clear();
- FullTextSession session = Search.createFullTextSession(s);
+ FullTextSession session = Search.getFullTextSession(s);
tx = session.beginTransaction();
QueryParser p = new QueryParser("id", new StandardAnalyzer( ) );
List result = session.createFullTextQuery( p.parse( "Abstract:Hibernate" ) ).list();
@@ -49,7 +49,7 @@
s.clear();
- FullTextSession session = Search.createFullTextSession(s);
+ FullTextSession session = Search.getFullTextSession(s);
tx = session.beginTransaction();
QueryParser p = new QueryParser("id", new StandardAnalyzer( ) );
List result = session.createFullTextQuery( p.parse( "title:Action OR Abstract:Action" ) ).list();
Modified: search/trunk/src/test/org/hibernate/search/test/filter/FilterTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/filter/FilterTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/filter/FilterTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -25,7 +25,7 @@
public void testNamedFilters() {
createData();
- FullTextSession s = Search.createFullTextSession( openSession( ) );
+ FullTextSession s = Search.getFullTextSession( openSession( ) );
s.getTransaction().begin();
BooleanQuery query = new BooleanQuery();
query.add( new TermQuery( new Term("teacher", "andre") ), BooleanClause.Occur.SHOULD );
@@ -57,7 +57,7 @@
public void testCache() {
createData();
- FullTextSession s = Search.createFullTextSession( openSession( ) );
+ FullTextSession s = Search.getFullTextSession( openSession( ) );
s.getTransaction().begin();
BooleanQuery query = new BooleanQuery();
query.add( new TermQuery( new Term("teacher", "andre") ), BooleanClause.Occur.SHOULD );
@@ -86,7 +86,7 @@
public void testStraightFilters() {
createData();
- FullTextSession s = Search.createFullTextSession( openSession( ) );
+ FullTextSession s = Search.getFullTextSession( openSession( ) );
s.getTransaction().begin();
BooleanQuery query = new BooleanQuery();
query.add( new TermQuery( new Term("teacher", "andre") ), BooleanClause.Occur.SHOULD );
Modified: search/trunk/src/test/org/hibernate/search/test/id/EmbeddedIdTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/id/EmbeddedIdTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/id/EmbeddedIdTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -27,7 +27,7 @@
tx.commit();
s.clear();
tx = s.beginTransaction();
- List results = Search.createFullTextSession( s ).createFullTextQuery(
+ List results = Search.getFullTextSession( s ).createFullTextQuery(
new TermQuery( new Term("id.lastName", "Bernard" ) ) ).list();
assertEquals( 1, results.size() );
emm = (Person) results.get(0);
@@ -35,7 +35,7 @@
tx.commit();
s.clear();
tx = s.beginTransaction();
- results = Search.createFullTextSession( s ).createFullTextQuery(
+ results = Search.getFullTextSession( s ).createFullTextQuery(
new TermQuery( new Term("id.lastName", "Bernard" ) ) ).list();
assertEquals( 1, results.size() );
emm = (Person) results.get(0);
Modified: search/trunk/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java 2008-07-02 15:24:00 UTC (rev 14844)
+++ search/trunk/src/test/org/hibernate/search/test/inheritance/InheritanceTest.java 2008-07-03 12:41:06 UTC (rev 14845)
@@ -20,7 +20,7 @@
public class InheritanceTest extends SearchTestCase {
public void testInheritance() throws Exception {
- FullTextSession s = Search.createFullTextSession( openSession() );
+ FullTextSession s = Search.getFullTextSession( openSession() );
Transaction tx = s.beginTransaction();
Animal a = new Animal();
a.setName("Shark Jr");
More information about the hibernate-commits
mailing list