[hibernate-commits] Hibernate SVN: r19832 - 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
Mon Jun 28 08:29:00 EDT 2010
Author: epbernard
Date: 2010-06-28 08:28:59 -0400 (Mon, 28 Jun 2010)
New Revision: 19832
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/FuzzyContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/PhraseContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryCustomization.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/RangeMatchingContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/RangeTerminationExcludable.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermFuzzy.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/BooleanQueryBuilder.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedAllContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedFuzzyContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsRangeQueryBuilder.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedPhraseContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedRangeContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedRangeMatchingContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedWildcardContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/QueryCustomizer.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java
Log:
HSEARCH-414 Rename options to be more fluent
withSlop, withThreshold etc
filteredBy etc
exclude() is now excludeLimit()
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/FuzzyContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/FuzzyContext.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/FuzzyContext.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -14,7 +14,7 @@
* Value between 0 and 1 (1 excluded)
* Defaults to .5
*/
- FuzzyContext threshold(float threshold);
+ FuzzyContext withThreshold(float threshold);
/**
* Size of the prefix ignored by the fuzzyness.
@@ -22,5 +22,5 @@
*
* Defaults to 0
*/
- FuzzyContext prefixLength(int prefixLength);
+ FuzzyContext withPrefixLength(int prefixLength);
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/PhraseContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/PhraseContext.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/PhraseContext.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -11,7 +11,7 @@
*
* Defaults to 0
*/
- PhraseContext slop(int slop);
+ PhraseContext withSlop(int slop);
/**
* field / property the term query is executed on
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryCustomization.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryCustomization.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryCustomization.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -24,12 +24,12 @@
* All results matching the query have a constant score equals to the boost
* FIXME is that true?
*/
- T constantScore();
+ T withConstantScore();
/**
* Filter the query results with the Filter instance
*/
- T filter(Filter filter);
+ T filteredBy(Filter filter);
//TODO filter(String) + parameters
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/RangeMatchingContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/RangeMatchingContext.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/RangeMatchingContext.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -16,18 +16,18 @@
public interface FromRangeContext<T> {
RangeTerminationExcludable to(T to);
- FromRangeContext<T> exclude();
+ FromRangeContext<T> excludeLimit();
}
/**
* The field value must be below <code>below</code>
- * You can exclude the value <code>below</code> by calling <code>.exclude()</code>
+ * You can exclude the value <code>below</code> by calling <code>.excludeLimit()</code>
*/
RangeTerminationExcludable below(Object below);
/**
* The field value must be above <code>above</code>
- * You can exclude the value <code>above</code> by calling <code>.exclude()</code>
+ * You can exclude the value <code>above</code> by calling <code>.excludeLimit()</code>
*/
RangeTerminationExcludable above(Object above);
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/RangeTerminationExcludable.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/RangeTerminationExcludable.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/RangeTerminationExcludable.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -4,5 +4,5 @@
* @author Emmanuel Bernard
*/
public interface RangeTerminationExcludable extends Termination<RangeTerminationExcludable> {
- RangeTerminationExcludable exclude();
+ RangeTerminationExcludable excludeLimit();
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermFuzzy.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermFuzzy.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermFuzzy.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -9,7 +9,7 @@
* Value between 0 and 1 (1 excluded)
* Defaults to .5
*/
- TermFuzzy threshold(float threshold);
+ TermFuzzy withThreshold(float threshold);
/**
* Size of the prefix ignored by the fuzzyness.
@@ -17,5 +17,5 @@
*
* Defaults to 0
*/
- TermFuzzy prefixLength(int prefixLength);
+ TermFuzzy withPrefixLength(int prefixLength);
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/BooleanQueryBuilder.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/BooleanQueryBuilder.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/BooleanQueryBuilder.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -50,13 +50,13 @@
return this;
}
- public MustJunction constantScore() {
- queryCustomizer.constantScore();
+ public MustJunction withConstantScore() {
+ queryCustomizer.withConstantScore();
return this;
}
- public MustJunction filter(Filter filter) {
- queryCustomizer.filter(filter);
+ public MustJunction filteredBy(Filter filter) {
+ queryCustomizer.filteredBy(filter);
return this;
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedAllContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedAllContext.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedAllContext.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -51,13 +51,13 @@
return this;
}
- public AllContext constantScore() {
- queryCustomizer.constantScore();
+ public AllContext withConstantScore() {
+ queryCustomizer.withConstantScore();
return this;
}
- public AllContext filter(Filter filter) {
- queryCustomizer.filter( filter );
+ public AllContext filteredBy(Filter filter) {
+ queryCustomizer.filteredBy( filter );
return this;
}
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedFuzzyContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedFuzzyContext.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedFuzzyContext.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -23,12 +23,12 @@
return new ConnectedTermMatchingContext(termContext, field, queryCustomizer, queryContext);
}
- public ConnectedFuzzyContext threshold(float threshold) {
+ public ConnectedFuzzyContext withThreshold(float threshold) {
termContext.setThreshold( threshold );
return this;
}
- public ConnectedFuzzyContext prefixLength(int prefixLength) {
+ public ConnectedFuzzyContext withPrefixLength(int prefixLength) {
termContext.setPrefixLength( prefixLength );
return this;
}
@@ -38,13 +38,13 @@
return this;
}
- public FuzzyContext constantScore() {
- queryCustomizer.constantScore();
+ public FuzzyContext withConstantScore() {
+ queryCustomizer.withConstantScore();
return this;
}
- public FuzzyContext filter(Filter filter) {
- queryCustomizer.filter(filter);
+ public FuzzyContext filteredBy(Filter filter) {
+ queryCustomizer.filteredBy(filter);
return this;
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsRangeQueryBuilder.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsRangeQueryBuilder.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsRangeQueryBuilder.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -30,7 +30,7 @@
this.queryContext = queryContext;
}
- public RangeTerminationExcludable exclude() {
+ public RangeTerminationExcludable excludeLimit() {
if ( rangeContext.getFrom() != null && rangeContext.getTo() != null ) {
rangeContext.setExcludeTo( true );
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedPhraseContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedPhraseContext.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedPhraseContext.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -1,9 +1,7 @@
package org.hibernate.search.query.dsl.v2.impl;
-import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.search.Filter;
-import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.query.dsl.v2.PhraseContext;
import org.hibernate.search.query.dsl.v2.PhraseMatchingContext;
@@ -22,7 +20,7 @@
this.queryContext = queryContext;
}
- public PhraseContext slop(int slop) {
+ public PhraseContext withSlop(int slop) {
phraseContext.setSlop( slop );
return this;
}
@@ -36,13 +34,13 @@
return this;
}
- public PhraseContext constantScore() {
- queryCustomizer.constantScore();
+ public PhraseContext withConstantScore() {
+ queryCustomizer.withConstantScore();
return this;
}
- public PhraseContext filter(Filter filter) {
- queryCustomizer.filter(filter);
+ public PhraseContext filteredBy(Filter filter) {
+ queryCustomizer.filteredBy(filter);
return this;
}
}
\ No newline at end of file
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedRangeContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedRangeContext.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedRangeContext.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -1,10 +1,7 @@
package org.hibernate.search.query.dsl.v2.impl;
-import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.search.Filter;
-import org.hibernate.search.SearchFactory;
-import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.query.dsl.v2.RangeContext;
import org.hibernate.search.query.dsl.v2.RangeMatchingContext;
@@ -29,13 +26,13 @@
return this;
}
- public RangeContext constantScore() {
- queryCustomizer.constantScore();
+ public RangeContext withConstantScore() {
+ queryCustomizer.withConstantScore();
return this;
}
- public RangeContext filter(Filter filter) {
- queryCustomizer.filter(filter);
+ public RangeContext filteredBy(Filter filter) {
+ queryCustomizer.filteredBy(filter);
return this;
}
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedRangeMatchingContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedRangeMatchingContext.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedRangeMatchingContext.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -55,7 +55,7 @@
mother.queryContext);
}
- public FromRangeContext<T> exclude() {
+ public FromRangeContext<T> excludeLimit() {
mother.rangeContext.setExcludeFrom( true );
return this;
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermContext.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermContext.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -42,13 +42,13 @@
return this;
}
- public ConnectedTermContext constantScore() {
- queryCustomizer.constantScore();
+ public ConnectedTermContext withConstantScore() {
+ queryCustomizer.withConstantScore();
return this;
}
- public ConnectedTermContext filter(Filter filter) {
- queryCustomizer.filter(filter);
+ public ConnectedTermContext filteredBy(Filter filter) {
+ queryCustomizer.filteredBy(filter);
return this;
}
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedWildcardContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedWildcardContext.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedWildcardContext.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -28,13 +28,13 @@
return this;
}
- public WildcardContext constantScore() {
- queryCustomizer.constantScore();
+ public WildcardContext withConstantScore() {
+ queryCustomizer.withConstantScore();
return this;
}
- public WildcardContext filter(Filter filter) {
- queryCustomizer.filter(filter);
+ public WildcardContext filteredBy(Filter filter) {
+ queryCustomizer.filteredBy(filter);
return this;
}
}
\ No newline at end of file
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/QueryCustomizer.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/QueryCustomizer.java 2010-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/QueryCustomizer.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -24,12 +24,12 @@
return this;
}
- public QueryCustomizer constantScore() {
+ public QueryCustomizer withConstantScore() {
constantScore = true;
return this;
}
- public QueryCustomizer filter(Filter filter) {
+ public QueryCustomizer filteredBy(Filter filter) {
this.filter = filter;
return this;
}
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-06-28 11:09:59 UTC (rev 19831)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java 2010-06-28 12:28:59 UTC (rev 19832)
@@ -1,10 +1,8 @@
package org.hibernate.search.test.query.dsl;
-import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
-import java.util.Locale;
import java.util.TimeZone;
import org.apache.lucene.document.DateTools;
@@ -105,8 +103,8 @@
query = monthQb
.keyword()
.fuzzy()
- .threshold( .8f )
- .prefixLength( 1 )
+ .withThreshold( .8f )
+ .withPrefixLength( 1 )
.onField( "mythology" )
.matching( "calder" )
.createQuery();
@@ -289,7 +287,7 @@
.andField( "justfortest" )
.ignoreFieldBridge().ignoreAnalyzer()
.from( from )
- .to( to ).exclude()
+ .to( to ).excludeLimit()
.createQuery();
assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() );
@@ -301,7 +299,7 @@
.andField( "justfortest" )
.ignoreFieldBridge().ignoreAnalyzer()
.from( DateTools.dateToString( from, DateTools.Resolution.MINUTE ) )
- .to( DateTools.dateToString( to, DateTools.Resolution.MINUTE ) ).exclude()
+ .to( DateTools.dateToString( to, DateTools.Resolution.MINUTE ) ).excludeLimit()
.createQuery();
assertEquals( 1, fts.createFullTextQuery( query, Month.class ).getResultSize() );
@@ -385,7 +383,7 @@
query = monthQb.
phrase()
- .slop( 1 )
+ .withSlop( 1 )
.onField( "mythology" )
.sentence( "Month whitening" )
.createQuery();
More information about the hibernate-commits
mailing list