[hibernate-commits] Hibernate SVN: r19279 - in search/trunk/hibernate-search/src: main/java/org/hibernate/search/query/dsl/v2/impl and 1 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Thu Apr 22 04:29:48 EDT 2010
Author: epbernard
Date: 2010-04-22 04:29:46 -0400 (Thu, 22 Apr 2010)
New Revision: 19279
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java
Log:
HSEARCH-508 use matching() instead of matches() to eliminate the singular / plural issue
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java 2010-04-22 07:15:28 UTC (rev 19278)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java 2010-04-22 08:29:46 UTC (rev 19279)
@@ -7,7 +7,7 @@
/**
* text searched in the term query (the term is pre-analyzer unless ignoreAnalyzer is called)
*/
- TermTermination matches(String text);
+ TermTermination matching(String text);
/**
* field / property the term query is executed on
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java 2010-04-22 07:15:28 UTC (rev 19278)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java 2010-04-22 08:29:46 UTC (rev 19279)
@@ -44,7 +44,7 @@
}
}
- public TermTermination matches(String text) {
+ public TermTermination matching(String text) {
return new ConnectedMultiFieldsTermQueryBuilder( queryContext, text, fieldContexts, queryCustomizer, queryAnalyzer, factory);
}
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java 2010-04-22 07:15:28 UTC (rev 19278)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java 2010-04-22 08:29:46 UTC (rev 19279)
@@ -34,31 +34,31 @@
.buildQueryBuilder().forEntity( Month.class ).get();
Query
//regular term query
- query = monthQb.exact().onField( "mythology" ).matches( "cold" ).createQuery();
+ query = monthQb.exact().onField( "mythology" ).matching( "cold" ).createQuery();
assertEquals( 0, fts.createFullTextQuery( query, Month.class ).getResultSize() );
//term query based on several words
- query = monthQb.exact().onField( "mythology" ).matches( "colder darker" ).createQuery();
+ query = monthQb.exact().onField( "mythology" ).matching( "colder darker" ).createQuery();
assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() );
//term query applying the analyzer and generating one term per word
- query = monthQb.exact().onField( "mythology_stem" ).matches( "snowboard" ).createQuery();
+ query = monthQb.exact().onField( "mythology_stem" ).matching( "snowboard" ).createQuery();
assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() );
//term query applying the analyzer and generating several terms per word
- query = monthQb.exact().onField( "mythology_ngram" ).matches( "snobored" ).createQuery();
+ query = monthQb.exact().onField( "mythology_ngram" ).matching( "snobored" ).createQuery();
assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() );
//term query not using analyzers
- query = monthQb.exact().onField( "mythology" ).ignoreAnalyzer().matches( "Month" ).createQuery();
+ query = monthQb.exact().onField( "mythology" ).ignoreAnalyzer().matching( "Month" ).createQuery();
assertEquals( 0, fts.createFullTextQuery( query, Month.class ).getResultSize() );
- query = monthQb.exact().onField( "mythology" ).matches( "Month" ).createQuery();
+ query = monthQb.exact().onField( "mythology" ).matching( "Month" ).createQuery();
transaction.commit();
@@ -79,7 +79,7 @@
.threshold( .8f )
.prefixLength( 1 )
.onField( "mythology" )
- .matches( "calder" )
+ .matching( "calder" )
.createQuery();
assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() );
@@ -88,7 +88,7 @@
query = monthQb
.wildcard()
.onField( "mythology" )
- .matches( "mon*" )
+ .matching( "mon*" )
.createQuery();
assertEquals( 2, fts.createFullTextQuery( query, Month.class ).getResultSize() );
@@ -109,8 +109,8 @@
//combined query, January and february both contain whitening but February in a longer text
query = monthQb
.bool()
- .should( monthQb.exact().onField( "mythology" ).matches( "whitening" ).createQuery() )
- .should( monthQb.exact().onField( "history" ).matches( "whitening" ).createQuery() )
+ .should( monthQb.exact().onField( "mythology" ).matching( "whitening" ).createQuery() )
+ .should( monthQb.exact().onField( "history" ).matching( "whitening" ).createQuery() )
.createQuery();
List<Month> results = fts.createFullTextQuery( query, Month.class ).list();
@@ -121,8 +121,8 @@
//since history is boosted, February should come first though
query = monthQb
.bool()
- .should( monthQb.exact().onField( "mythology" ).matches( "whitening" ).createQuery() )
- .should( monthQb.exact().onField( "history" ).boostedTo( 30 ).matches( "whitening" ).createQuery() )
+ .should( monthQb.exact().onField( "mythology" ).matching( "whitening" ).createQuery() )
+ .should( monthQb.exact().onField( "history" ).boostedTo( 30 ).matching( "whitening" ).createQuery() )
.createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
@@ -148,7 +148,7 @@
query = monthQb.exact()
.onField( "mythology" )
.andField( "history" )
- .matches( "whitening" ).createQuery();
+ .matching( "whitening" ).createQuery();
List<Month> results = fts.createFullTextQuery( query, Month.class ).list();
assertEquals( 2, results.size() );
@@ -158,7 +158,7 @@
query = monthQb.exact()
.onFields( "mythology", "history" )
.boostedTo( 30 )
- .matches( "whitening" ).createQuery();
+ .matching( "whitening" ).createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
assertEquals( 2, results.size() );
@@ -170,7 +170,7 @@
.onField( "mythology" )
.andField( "history" )
.boostedTo( 30 )
- .matches( "whitening" )
+ .matching( "whitening" )
.createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
@@ -195,7 +195,7 @@
//must
query = monthQb
.bool()
- .must( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() )
+ .must( monthQb.exact().onField( "mythology" ).matching( "colder" ).createQuery() )
.createQuery();
List<Month> results = fts.createFullTextQuery( query, Month.class ).list();
@@ -206,7 +206,7 @@
query = monthQb
.bool()
.should( monthQb.all().createQuery() )
- .must( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() )
+ .must( monthQb.exact().onField( "mythology" ).matching( "colder" ).createQuery() )
.not()
.createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
@@ -216,7 +216,7 @@
//implicit must not + all (not recommended)
query = monthQb
.bool()
- .must( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() )
+ .must( monthQb.exact().onField( "mythology" ).matching( "colder" ).createQuery() )
.not()
.createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
@@ -226,7 +226,7 @@
//all except (recommended)
query = monthQb
.all()
- .except( monthQb.exact().onField( "mythology" ).matches( "colder" ).createQuery() )
+ .except( monthQb.exact().onField( "mythology" ).matching( "colder" ).createQuery() )
.createQuery();
results = fts.createFullTextQuery( query, Month.class ).list();
More information about the hibernate-commits
mailing list