[hibernate-commits] Hibernate SVN: r19669 - search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl.

Author: epbernard Date: 2010-06-02 11:52:51 -0400 (Wed, 02 Jun 2010) New Revision: 19669 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/ConnectedMultiFieldsRangeQueryBuilder.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsTermQueryBuilder.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/ConnectedPhraseMatchingContext.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryBuilder.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryContextBuilder.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/ConnectedTermMatchingContext.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedWildcardContext.java Log: HSEARCH-533 pass SearchFactoryImplementor instead of SearchFactory 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-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedFuzzyContext.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -4,6 +4,7 @@ import org.apache.lucene.search.Filter; import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.FuzzyContext; import org.hibernate.search.query.dsl.v2.TermMatchingContext; @@ -11,12 +12,12 @@ * @author Emmanuel Bernard */ class ConnectedFuzzyContext implements FuzzyContext { - private final SearchFactory factory; + private final SearchFactoryImplementor factory; private final Analyzer queryAnalyzer; private final QueryCustomizer queryCustomizer; private final TermQueryContext context; - public ConnectedFuzzyContext(Analyzer queryAnalyzer, SearchFactory factory, QueryCustomizer queryCustomizer) { + public ConnectedFuzzyContext(Analyzer queryAnalyzer, SearchFactoryImplementor factory, QueryCustomizer queryCustomizer) { this.factory = factory; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = queryCustomizer; 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-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsRangeQueryBuilder.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -15,6 +15,8 @@ import org.hibernate.annotations.common.AssertionFailure; import org.hibernate.search.SearchException; +import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.RangeTerminationExcludable; /** @@ -25,12 +27,16 @@ private final Analyzer queryAnalyzer; private final QueryCustomizer queryCustomizer; private final List<FieldContext> fieldContexts; + private final SearchFactoryImplementor factory; - public ConnectedMultiFieldsRangeQueryBuilder(RangeQueryContext queryContext, Analyzer queryAnalyzer, QueryCustomizer queryCustomizer, List<FieldContext> fieldContexts) { + public ConnectedMultiFieldsRangeQueryBuilder(RangeQueryContext queryContext, Analyzer queryAnalyzer, + QueryCustomizer queryCustomizer, List<FieldContext> fieldContexts, + SearchFactoryImplementor factory) { this.queryContext = queryContext; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = queryCustomizer; this.fieldContexts = fieldContexts; + this.factory = factory; } public RangeTerminationExcludable exclude() { Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsTermQueryBuilder.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsTermQueryBuilder.java 2010-06-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedMultiFieldsTermQueryBuilder.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -16,6 +16,7 @@ import org.hibernate.annotations.common.AssertionFailure; import org.hibernate.search.SearchException; import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.TermTermination; /** @@ -33,7 +34,7 @@ List<FieldContext> fieldContexts, QueryCustomizer queryCustomizer, Analyzer queryAnalyzer, - SearchFactory factory) { + SearchFactoryImplementor factory) { this.queryContext = queryContext; this.text = text; this.queryAnalyzer = queryAnalyzer; 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-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedPhraseContext.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -4,6 +4,7 @@ import org.apache.lucene.search.Filter; import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.PhraseContext; import org.hibernate.search.query.dsl.v2.PhraseMatchingContext; import org.hibernate.search.query.dsl.v2.RangeContext; @@ -13,13 +14,13 @@ * @author Emmanuel Bernard */ class ConnectedPhraseContext implements PhraseContext { - private final SearchFactory factory; + private final SearchFactoryImplementor factory; private final Analyzer queryAnalyzer; private final QueryCustomizer queryCustomizer; private final PhraseQueryContext queryContext; - public ConnectedPhraseContext(Analyzer queryAnalyzer, SearchFactory factory) { + public ConnectedPhraseContext(Analyzer queryAnalyzer, SearchFactoryImplementor factory) { this.factory = factory; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = new QueryCustomizer(); Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedPhraseMatchingContext.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedPhraseMatchingContext.java 2010-06-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedPhraseMatchingContext.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -6,6 +6,7 @@ import org.apache.lucene.analysis.Analyzer; import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.PhraseMatchingContext; import org.hibernate.search.query.dsl.v2.PhraseTermination; import org.hibernate.search.query.dsl.v2.RangeMatchingContext; @@ -15,7 +16,7 @@ * @author Emmanuel Bernard */ public class ConnectedPhraseMatchingContext implements PhraseMatchingContext { - private final SearchFactory factory; + private final SearchFactoryImplementor factory; private final Analyzer queryAnalyzer; private final QueryCustomizer queryCustomizer; private final PhraseQueryContext queryContext; @@ -28,7 +29,7 @@ PhraseQueryContext queryContext, QueryCustomizer queryCustomizer, Analyzer queryAnalyzer, - SearchFactory factory) { + SearchFactoryImplementor factory) { this.factory = factory; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = queryCustomizer; Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryBuilder.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryBuilder.java 2010-06-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryBuilder.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -3,6 +3,7 @@ import org.apache.lucene.analysis.Analyzer; import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.AllContext; import org.hibernate.search.query.dsl.v2.BooleanJunction; import org.hibernate.search.query.dsl.v2.FuzzyContext; @@ -19,9 +20,9 @@ */ public class ConnectedQueryBuilder implements QueryBuilder { private final Analyzer queryAnalyzer; - private final SearchFactory factory; + private final SearchFactoryImplementor factory; - public ConnectedQueryBuilder(Analyzer queryAnalyzer, SearchFactory factory) { + public ConnectedQueryBuilder(Analyzer queryAnalyzer, SearchFactoryImplementor factory) { this.queryAnalyzer = queryAnalyzer; this.factory = factory; } Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryContextBuilder.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryContextBuilder.java 2010-06-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryContextBuilder.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -1,6 +1,7 @@ package org.hibernate.search.query.dsl.v2.impl; import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.EntityContext; import org.hibernate.search.query.dsl.v2.QueryBuilder; import org.hibernate.search.query.dsl.v2.QueryContextBuilder; @@ -12,9 +13,9 @@ * @author Emmanuel Bernard */ public class ConnectedQueryContextBuilder implements QueryContextBuilder { - private final SearchFactory factory; + private final SearchFactoryImplementor factory; - public ConnectedQueryContextBuilder(SearchFactory factory) { + public ConnectedQueryContextBuilder(SearchFactoryImplementor factory) { this.factory = factory; } @@ -24,9 +25,9 @@ public final class HSearchEntityContext implements EntityContext { private final ScopedAnalyzer queryAnalyzer; - private final SearchFactory factory; + private final SearchFactoryImplementor factory; - public HSearchEntityContext(Class<?> entityType, SearchFactory factory) { + public HSearchEntityContext(Class<?> entityType, SearchFactoryImplementor factory) { this.factory = factory; queryAnalyzer = new ScopedAnalyzer(); queryAnalyzer.setGlobalAnalyzer( factory.getAnalyzer( entityType ) ); 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-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedRangeContext.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -4,6 +4,7 @@ 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; @@ -11,11 +12,11 @@ * @author Emmanuel Bernard */ class ConnectedRangeContext implements RangeContext { - private final SearchFactory factory; + private final SearchFactoryImplementor factory; private final Analyzer queryAnalyzer; private final QueryCustomizer queryCustomizer; - public ConnectedRangeContext(Analyzer queryAnalyzer, SearchFactory factory) { + public ConnectedRangeContext(Analyzer queryAnalyzer, SearchFactoryImplementor factory) { this.factory = factory; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = new QueryCustomizer(); 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-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedRangeMatchingContext.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -6,6 +6,7 @@ import org.apache.lucene.analysis.Analyzer; import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.RangeMatchingContext; import org.hibernate.search.query.dsl.v2.RangeTerminationExcludable; @@ -13,7 +14,7 @@ * @author Emmanuel Bernard */ public class ConnectedRangeMatchingContext implements RangeMatchingContext { - private final SearchFactory factory; + private final SearchFactoryImplementor factory; private final Analyzer queryAnalyzer; private final QueryCustomizer queryCustomizer; private final RangeQueryContext queryContext; @@ -25,7 +26,7 @@ public ConnectedRangeMatchingContext(String fieldName, QueryCustomizer queryCustomizer, Analyzer queryAnalyzer, - SearchFactory factory) { + SearchFactoryImplementor factory) { this.factory = factory; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = queryCustomizer; @@ -58,7 +59,8 @@ mother.queryContext, mother.queryAnalyzer, mother.queryCustomizer, - mother.fieldContexts); + mother.fieldContexts, + mother.factory); } public FromRangeContext<T> exclude() { @@ -69,12 +71,12 @@ public RangeTerminationExcludable below(Object below) { queryContext.setTo( below ); - return new ConnectedMultiFieldsRangeQueryBuilder(queryContext, queryAnalyzer, queryCustomizer, fieldContexts); + return new ConnectedMultiFieldsRangeQueryBuilder(queryContext, queryAnalyzer, queryCustomizer, fieldContexts, factory); } public RangeTerminationExcludable above(Object above) { queryContext.setFrom( above ); - return new ConnectedMultiFieldsRangeQueryBuilder(queryContext, queryAnalyzer, queryCustomizer, fieldContexts); + return new ConnectedMultiFieldsRangeQueryBuilder(queryContext, queryAnalyzer, queryCustomizer, fieldContexts, factory); } public RangeMatchingContext boostedTo(float boost) { 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-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermContext.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -4,6 +4,7 @@ import org.apache.lucene.search.Filter; import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.FuzzyContext; import org.hibernate.search.query.dsl.v2.TermContext; import org.hibernate.search.query.dsl.v2.TermMatchingContext; @@ -13,12 +14,12 @@ * @author Emmanuel Bernard */ class ConnectedTermContext implements TermContext { - private final SearchFactory factory; + private final SearchFactoryImplementor factory; private final Analyzer queryAnalyzer; private final QueryCustomizer queryCustomizer; private final TermQueryContext context; - public ConnectedTermContext(Analyzer queryAnalyzer, SearchFactory factory) { + public ConnectedTermContext(Analyzer queryAnalyzer, SearchFactoryImplementor factory) { this.factory = factory; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = new QueryCustomizer(); 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-06-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermMatchingContext.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -6,6 +6,7 @@ import org.apache.lucene.analysis.Analyzer; import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.TermMatchingContext; import org.hibernate.search.query.dsl.v2.TermTermination; @@ -13,7 +14,7 @@ * @author Emmanuel Bernard */ public class ConnectedTermMatchingContext implements TermMatchingContext { - private final SearchFactory factory; + private final SearchFactoryImplementor factory; private final Analyzer queryAnalyzer; private final QueryCustomizer queryCustomizer; private final TermQueryContext queryContext; @@ -23,7 +24,7 @@ private int firstOfContext = 0; public ConnectedTermMatchingContext(TermQueryContext queryContext, - String field, QueryCustomizer queryCustomizer, Analyzer queryAnalyzer, SearchFactory factory) { + String field, QueryCustomizer queryCustomizer, Analyzer queryAnalyzer, SearchFactoryImplementor factory) { this.factory = factory; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = queryCustomizer; @@ -33,7 +34,7 @@ } public ConnectedTermMatchingContext(TermQueryContext queryContext, - String[] fields, QueryCustomizer queryCustomizer, Analyzer queryAnalyzer, SearchFactory factory) { + String[] fields, QueryCustomizer queryCustomizer, Analyzer queryAnalyzer, SearchFactoryImplementor factory) { this.factory = factory; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = queryCustomizer; 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-02 15:51:57 UTC (rev 19668) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedWildcardContext.java 2010-06-02 15:52:51 UTC (rev 19669) @@ -4,6 +4,7 @@ import org.apache.lucene.search.Filter; import org.hibernate.search.SearchFactory; +import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.query.dsl.v2.TermMatchingContext; import org.hibernate.search.query.dsl.v2.WildcardContext; @@ -11,12 +12,12 @@ * @author Emmanuel Bernard */ class ConnectedWildcardContext implements WildcardContext { - private final SearchFactory factory; + private final SearchFactoryImplementor factory; private final Analyzer queryAnalyzer; private final QueryCustomizer queryCustomizer; private final TermQueryContext context; - public ConnectedWildcardContext(Analyzer queryAnalyzer, SearchFactory factory, QueryCustomizer queryCustomizer) { + public ConnectedWildcardContext(Analyzer queryAnalyzer, SearchFactoryImplementor factory, QueryCustomizer queryCustomizer) { this.factory = factory; this.queryAnalyzer = queryAnalyzer; this.queryCustomizer = queryCustomizer;