[hibernate-commits] Hibernate SVN: r19016 - in search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2: impl and 1 other directory.

Author: epbernard Date: 2010-03-17 13:28:48 -0400 (Wed, 17 Mar 2010) New Revision: 19016 Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/EntityContext.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermCustomization.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/TermMatchingContext.java Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryContextBuilder.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermContext.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/ConnectedTermContext.java Log: HSEARCH-414 move everything to top level class as it does not play nicely with IDE's autocompletion Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/EntityContext.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/EntityContext.java (rev 0) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/EntityContext.java 2010-03-17 17:28:48 UTC (rev 19016) @@ -0,0 +1,13 @@ +package org.hibernate.search.query.dsl.v2; + +/** +* @author Emmanuel Bernard +*/ +public interface EntityContext { + EntityContext overridesForField(String field, String analyzerName); + + /** + * return the query builder + */ + QueryBuilder get(); +} Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryContextBuilder.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryContextBuilder.java 2010-03-17 16:57:33 UTC (rev 19015) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/QueryContextBuilder.java 2010-03-17 17:28:48 UTC (rev 19016) @@ -20,12 +20,4 @@ public interface QueryContextBuilder { //TODO make a forEntities EntityContext forEntity(Class<?> entityType); - interface EntityContext { - EntityContext overridesForField(String field, String analyzerName); - - /** - * return the query builder - */ - QueryBuilder get(); - } } Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermContext.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermContext.java 2010-03-17 16:57:33 UTC (rev 19015) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermContext.java 2010-03-17 17:28:48 UTC (rev 19016) @@ -11,56 +11,4 @@ */ TermMatchingContext on(String field); - interface TermMatchingContext { - /** - * text searched in the term query (the term is pre-analyzer unless ignoreAnalyzer is called) - */ - TermCustomization matches(String text); - } - - interface TermCustomization { - /** - * Advanced - * Do not execute the analyzer on the text. - * (It is usually a good idea to apply the analyzer) - */ - TermCustomization ignoreAnalyzer(); - - /** - * Use a fuzzy search approximation (aka edit distance) - */ - TermFuzzy fuzzy(); - - /** - * Treat the query as a wildcard: - * - ? represents any single character - * - * represents any character sequence - * For faster results, it is recommended that the query text does not - * start with ? or * - */ - //TODO make it mutually exclusive with fuzzy use (but that's much more complex) - TermCustomization wildcard(); - - /** - * Create a Lucene query - */ - Query createQuery(); - - interface TermFuzzy extends TermCustomization { - /** - * Threshold above which two terms are considered similar enough. - * Value between 0 and 1 (1 excluded) - * Defaults to .5 - */ - TermFuzzy threshold(float threshold); - - /** - * Size of the prefix ignored by the fuzzyness. - * A non zero value is recommended if the index contains a huge amount of distinct terms - * - * Defaults to 0 - */ - TermFuzzy prefixLength(int prefixLength); - } - } } Added: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermCustomization.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermCustomization.java (rev 0) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermCustomization.java 2010-03-17 17:28:48 UTC (rev 19016) @@ -0,0 +1,36 @@ +package org.hibernate.search.query.dsl.v2; + +import org.apache.lucene.search.Query; + +/** +* @author Emmanuel Bernard +*/ +public interface TermCustomization { + /** + * Advanced + * Do not execute the analyzer on the text. + * (It is usually a good idea to apply the analyzer) + */ + TermCustomization ignoreAnalyzer(); + + /** + * Use a fuzzy search approximation (aka edit distance) + */ + TermFuzzy fuzzy(); + + /** + * Treat the query as a wildcard: + * - ? represents any single character + * - * represents any character sequence + * For faster results, it is recommended that the query text does not + * start with ? or * + */ + //TODO make it mutually exclusive with fuzzy use (but that's much more complex) + TermCustomization wildcard(); + + /** + * Create a Lucene query + */ + Query createQuery(); + +} Added: 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 (rev 0) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermFuzzy.java 2010-03-17 17:28:48 UTC (rev 19016) @@ -0,0 +1,21 @@ +package org.hibernate.search.query.dsl.v2; + +/** +* @author Emmanuel Bernard +*/ +public interface TermFuzzy extends TermCustomization { + /** + * Threshold above which two terms are considered similar enough. + * Value between 0 and 1 (1 excluded) + * Defaults to .5 + */ + TermFuzzy threshold(float threshold); + + /** + * Size of the prefix ignored by the fuzzyness. + * A non zero value is recommended if the index contains a huge amount of distinct terms + * + * Defaults to 0 + */ + TermFuzzy prefixLength(int prefixLength); +} Added: 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 (rev 0) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/TermMatchingContext.java 2010-03-17 17:28:48 UTC (rev 19016) @@ -0,0 +1,11 @@ +package org.hibernate.search.query.dsl.v2; + +/** +* @author Emmanuel Bernard +*/ +public interface TermMatchingContext { + /** + * text searched in the term query (the term is pre-analyzer unless ignoreAnalyzer is called) + */ + TermCustomization matches(String text); +} 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-03-17 16:57:33 UTC (rev 19015) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedQueryContextBuilder.java 2010-03-17 17:28:48 UTC (rev 19016) @@ -1,6 +1,7 @@ package org.hibernate.search.query.dsl.v2.impl; import org.hibernate.search.SearchFactory; +import org.hibernate.search.query.dsl.v2.EntityContext; import org.hibernate.search.query.dsl.v2.QueryBuilder; import org.hibernate.search.query.dsl.v2.QueryContextBuilder; import org.hibernate.search.util.ScopedAnalyzer; @@ -21,7 +22,7 @@ return new HSearchEntityContext(entityType, factory ); } - public final class HSearchEntityContext implements QueryContextBuilder.EntityContext { + public final class HSearchEntityContext implements EntityContext { private final ScopedAnalyzer queryAnalyzer; private final SearchFactory factory; 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-03-17 16:57:33 UTC (rev 19015) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/ConnectedTermContext.java 2010-03-17 17:28:48 UTC (rev 19016) @@ -7,7 +7,6 @@ import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.TermAttribute; import org.apache.lucene.index.Term; @@ -22,6 +21,9 @@ import org.hibernate.search.SearchException; import org.hibernate.search.SearchFactory; import org.hibernate.search.query.dsl.v2.TermContext; +import org.hibernate.search.query.dsl.v2.TermCustomization; +import org.hibernate.search.query.dsl.v2.TermFuzzy; +import org.hibernate.search.query.dsl.v2.TermMatchingContext; /** * @author Emmanuel Bernard @@ -55,7 +57,7 @@ } } - public static class ConnectedTermCustomization implements TermCustomization, TermCustomization.TermFuzzy { + public static class ConnectedTermCustomization implements TermCustomization, TermFuzzy { private final SearchFactory factory; private final String field; private final String text;