[hibernate-commits] [hibernate/hibernate-search] 05c871: HSEARCH-3290 Remove the fluent ("fluid") syntax fr...

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-search Commit: 05c871ad4a80c36f60b232c5d51b18fff8e3b327 https://github.com/hibernate/hibernate-search/commit/05c871ad4a80c36f60b2... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/BooleanJunctionPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/BooleanJunctionPredicateContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/FluidSearchPredicateDslContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/SearchQueryResultContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryPredicateCollector.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryWrappingDefinitionResultContextImpl.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/search/LuceneSearchMultiIndexIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/search/LuceneSearchSortIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/MultiTenancyIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/ObjectFieldStorageIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/SmokeIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/analysis/AnalysisCustomIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/SearchMultiIndexIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/SearchQueryIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/SearchResultLoadingOrTransformingIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/BoolSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchAllSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/NestedSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/RangeSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/SearchProjectionIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortByFieldIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/AbstractSpatialWithinSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/DistanceSearchProjectionIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinBoundingBoxSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinCircleSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinPolygonSearchPredicateIT.java M integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/AnnotationMappingSmokeIT.java M integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/ProgrammaticMappingSmokeIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/mapping/definition/DocumentIdDefaultBridgeIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/routing/AnnotationMappingRoutingIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/routing/ProgrammaticMappingRoutingIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/smoke/AnnotationMappingSmokeIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/smoke/ProgrammaticMappingSmokeIT.java R integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/fluidandlambda/FluidAndLambdaSyntaxDaoFactory.java R integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/fluidandlambda/FluidAndLambdaSyntaxDocumentDao.java R integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/fluidandlambda/FluidAndLambdaSyntaxLibraryDao.java R integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/fluidandlambda/FluidAndLambdaSyntaxPersonDao.java R integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/fluidandobject/FluidAndObjectSyntaxDaoFactory.java R integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/fluidandobject/FluidAndObjectSyntaxDocumentDao.java R integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/fluidandobject/FluidAndObjectSyntaxLibraryDao.java R integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/fluidandobject/FluidAndObjectSyntaxPersonDao.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/lambda/LambdaSyntaxDocumentDao.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/lambda/LambdaSyntaxLibraryDao.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/lambda/LambdaSyntaxPersonDao.java M integrationtest/showcase/library/src/test/java/org/hibernate/search/integrationtest/showcase/OrmElasticsearchLibraryShowcaseIT.java Log Message: ----------- HSEARCH-3290 Remove the fluent ("fluid") syntax from the query DSL and the boolean predicate DSL Commit: 72f954ffdd2f7755d34d2c49854cdae0be2d7f63 https://github.com/hibernate/hibernate-search/commit/72f954ffdd2f7755d34d... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchAllPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchAllPredicateContextImpl.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchAllSearchPredicateIT.java Log Message: ----------- HSEARCH-3290 Remove the fluent ("fluid") syntax from the matchAll predicate DSL Commit: c953cf5883293bec9025acec58e8e75f322b7352 https://github.com/hibernate/hibernate-search/commit/c953cf5883293bec9025... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/NestedPredicateContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/NestedPredicateFieldContextImpl.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/MultiTenancyIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/ObjectFieldStorageIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/SmokeIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/NestedSearchPredicateIT.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/lambda/LambdaSyntaxDocumentDao.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxDocumentDao.java Log Message: ----------- HSEARCH-3290 Remove the fluent ("fluid") syntax from the nested predicate DSL Commit: 8bdd8bcd95a2d4e8d9b4726792efd9914acedae4 https://github.com/hibernate/hibernate-search/commit/8bdd8bcd95a2d4e8d9b4... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/SearchQueryContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQuerySortCollector.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/FluidSearchSortDslContextImpl.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/search/LuceneSearchMultiIndexIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/SearchMultiIndexIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/SearchQueryIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/RangeSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/SearchProjectionIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortByFieldIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/DistanceSearchProjectionIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinBoundingBoxSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinCircleSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinPolygonSearchPredicateIT.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxLibraryDao.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxPersonDao.java Log Message: ----------- HSEARCH-3290 Remove the fluent ("fluid") syntax from the sort DSL Commit: b550c292409827708d0b1a57b44657a9414c10e1 https://github.com/hibernate/hibernate-search/commit/b550c292409827708d0b... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: R engine/src/main/java/org/hibernate/search/engine/search/dsl/ExplicitEndContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/BooleanJunctionPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchAllPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchPredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MinimumShouldMatchNonEmptyContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFromContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContext.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateTerminalContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialWithinPredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchPredicateFieldSetContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/NestedPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RangePredicateFieldSetContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SpatialWithinPredicateFieldSetContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/NonEmptySortContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortContainerContext.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortTerminalContext.java Log Message: ----------- HSEARCH-3290 Split ExplicitEndContext into SearchSortTerminalContext and SearchPredicateTerminalContext So as to be able to add specific methods to each. Commit: 3ad0c324b3036014bfdd367a9320a03778eeab60 https://github.com/hibernate/hibernate-search/commit/3ad0c324b3036014bfdd... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/sort/impl/SearchSortFactoryImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/SearchSortFactoryImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RootSearchPredicateDslContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateContributorAggregator.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/RootSearchSortDslContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchSortContainerContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchSortContributorAggregator.java M engine/src/main/java/org/hibernate/search/engine/search/sort/spi/SearchSortFactory.java M util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/sort/StubSearchSortFactory.java Log Message: ----------- HSEARCH-3290 Simplify the predicate/sort DSL contexts Now that we don't need to support the fluent ("fluid") syntax, we can have simpler implementations. Commit: 4dbd227d5dbfca1f5823d52c68b01f030c1b99b0 https://github.com/hibernate/hibernate-search/commit/4dbd227d5dbfca1f5823... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/sort/impl/ElasticsearchSearchSortContainerContextImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/sort/impl/LuceneSearchSortContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateTerminalContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/BooleanJunctionPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchAllPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MultiFieldPredicateCommonState.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/NestedPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RangePredicateFieldSetContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RootSearchPredicateDslContextImpl.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/AbstractObjectCreatingSearchPredicateContributor.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortTerminalContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/DistanceSortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/FieldSortContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/NonEmptySortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/RootSearchSortDslContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/ScoreSortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchSortContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchSortContainerExtensionContextImpl.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/spi/NonEmptySortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/spi/SearchSortDslContext.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java Log Message: ----------- HSEARCH-3290 Introduce toSort() and toPredicate() methods in the DSLs They can be used wherever end() can be used, but they always return a SearchSort/SearchPredicate, unlike end() that returns a context-specific type. This adds in particular the ability to cache predicates at any level of the DSL tree, not just the root like we used to. Commit: 176876e1dd7bc8901ef29f9e2cde5957c380917a https://github.com/hibernate/hibernate-search/commit/176876e1dd7bc8901ef2... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/ElasticsearchSearchPredicateContainerContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/impl/ElasticsearchSearchPredicateContainerContextImpl.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/impl/JsonStringPredicateContextImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/LuceneSearchPredicateContainerContext.java A backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/impl/LuceneQueryPredicateContextImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/impl/LuceneSearchPredicateContainerContextImpl.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java Log Message: ----------- HSEARCH-3290 Add a terminal context to ES/Lucene-specific predicate DSLs For consistency with other predicates. Commit: ee5d3f2b53ce9a9a9150206f4897d55225c0793b https://github.com/hibernate/hibernate-search/commit/ee5d3f2b53ce9a9a9150... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/DelegatingSearchPredicateContainerContextImpl.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java Log Message: ----------- HSEARCH-3290 Return a SearchPredicateTerminalContext from SearchPredicateContainerContext#bool(Consumer). ... instead of returning the next context (N) directly. This is for consistency with other predicates. Commit: 35cc0d8e447ee77bd533716e1031acf674499889 https://github.com/hibernate/hibernate-search/commit/35cc0d8e447ee77bd533... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/ElasticsearchSearchPredicateContainerContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/impl/ElasticsearchSearchPredicateContainerContextImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/impl/JsonStringPredicateContextImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/sort/ElasticsearchSearchSortContainerContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/sort/impl/ElasticsearchSearchSortContainerContextImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/LuceneSearchPredicateContainerContext.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/impl/LuceneQueryPredicateContextImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/impl/LuceneSearchPredicateContainerContextImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/sort/LuceneSearchSortContainerContext.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/sort/impl/LuceneSearchSortContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/backend/index/spi/IndexSearchTarget.java M engine/src/main/java/org/hibernate/search/engine/backend/index/spi/IndexSearchTargetBase.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/BooleanJunctionPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchAllPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchPredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFromContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContextExtension.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerExtensionContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateTerminalContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialWithinPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialWithinPredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/BooleanJunctionPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchAllPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchPredicateFieldSetContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MultiFieldPredicateCommonState.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/NestedPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RangePredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RangePredicateFieldSetContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RootSearchPredicateDslContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateContainerExtensionContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchTargetPredicateRootContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SpatialPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SpatialWithinPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SpatialWithinPredicateFieldSetContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/DelegatingSearchPredicateContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/SearchPredicateDslContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/SearchProjectionTerminalContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/SearchQueryContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/SearchQueryResultContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryPredicateCollector.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQuerySortCollector.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryWrappingDefinitionResultContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/DistanceSortContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/FieldSortContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/NonEmptySortContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/ScoreSortContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortContainerContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortContainerContextExtension.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortContainerExtensionContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortTerminalContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/DistanceSortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/FieldSortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/RootSearchSortDslContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/ScoreSortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchSortContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchSortContainerExtensionContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchTargetSortRootContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/spi/DelegatingSearchSortContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/spi/NonEmptySortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/spi/SearchSortDslContext.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/search/LuceneSearchSortIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortByFieldIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxDocumentDao.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/impl/FullTextSearchTargetImpl.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/jpa/FullTextSearchTarget.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/impl/HibernateOrmSearchTargetImpl.java M mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/mapping/PojoSearchTarget.java M mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/mapping/impl/PojoSearchTargetDelegateImpl.java Log Message: ----------- HSEARCH-3290 Remove the concept of "next" context in most of the sort/predicate DSLs Now that the fluent ("fluid") syntax is gone, the "next" context doesn't make any sense: the end() method always returns a SearchPredicate. Commit: b67c74bdf7a5a1a8102fb0b0179bdc0774366c29 https://github.com/hibernate/hibernate-search/commit/b67c74bdf7a5a1a8102f... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchPredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateTerminalContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialWithinPredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortContainerContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortTerminalContext.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/SmokeIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/BoolSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchAllSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/NestedSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/RangeSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinBoundingBoxSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinCircleSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinPolygonSearchPredicateIT.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxDocumentDao.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxLibraryDao.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxPersonDao.java Log Message: ----------- HSEARCH-3290 Replace end() calls with toPredicate()/toSort() in the predicate and sort DSLs Commit: 1f315ef97ae61b21607128e7eabd330e880c859d https://github.com/hibernate/hibernate-search/commit/1f315ef97ae61b216071... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/impl/ElasticsearchSearchPredicateContainerContextImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/impl/JsonStringPredicateContextImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/impl/LuceneQueryPredicateContextImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/impl/LuceneSearchPredicateContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/backend/index/spi/IndexSearchTargetBase.java M engine/src/main/java/org/hibernate/search/engine/common/dsl/impl/DslExtensionState.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/BooleanJunctionPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchAllPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContextExtension.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerExtensionContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/BooleanJunctionPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchAllPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MultiFieldPredicateCommonState.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/NestedPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RangePredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RangePredicateFieldSetContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RootSearchPredicateDslContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateContainerExtensionContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchTargetPredicateRootContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SpatialPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SpatialWithinPredicateContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/AbstractObjectCreatingSearchPredicateContributor.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/AbstractSearchPredicateTerminalContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/DelegatingSearchPredicateContainerContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/SearchPredicateContributor.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/SearchPredicateDslContext.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/StaticSearchPredicateContributor.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/SearchQueryResultContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryPredicateCollector.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryWrappingDefinitionResultContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchSortContainerExtensionContextImpl.java M engine/src/test/java/org/hibernate/search/engine/common/dsl/impl/DslExtensionStateTest.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/search/LuceneSearchMultiIndexIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/search/LuceneSearchSortIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/MultiTenancyIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/ObjectFieldStorageIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/SmokeIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/analysis/AnalysisCustomIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/SearchMultiIndexIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/SearchQueryIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/SearchResultLoadingOrTransformingIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/BoolSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchAllSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/NestedSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/RangeSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/SearchProjectionIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortByFieldIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/AbstractSpatialWithinSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/DistanceSearchProjectionIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinBoundingBoxSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinCircleSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinPolygonSearchPredicateIT.java M integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/AnnotationMappingSmokeIT.java M integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/smoke/ProgrammaticMappingSmokeIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/mapping/definition/DocumentIdDefaultBridgeIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/routing/AnnotationMappingRoutingIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/routing/ProgrammaticMappingRoutingIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/smoke/AnnotationMappingSmokeIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/smoke/ProgrammaticMappingSmokeIT.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/lambda/LambdaSyntaxDocumentDao.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/lambda/LambdaSyntaxLibraryDao.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/lambda/LambdaSyntaxPersonDao.java Log Message: ----------- HSEARCH-3290 Remove any notion of "position in the predicate tree" from DSL contexts ... so that container contexts can be used across all levels of the predicate tree. This is important mostly to avoid this: SearchQuery<DocumentReference> query = searchTarget.query( sessionContext ) .asReferences() .predicate( c -> c.bool() .must( c2 -> c2.match().onField( "field1" ).matching( FIELD1_VALUE1 ) ) .must( c2 -> c2.match().onField( "field2" ).matching( FIELD1_VALUE2 ) ) ) .build(); ... where one CANNOT use "c" where "c2" is used, because predicates would be added to the wrong place in the DSL context. The new syntax is as follows: SearchQuery<DocumentReference> query = searchTarget.query( sessionContext ) .asReferences() .predicate( f -> factory.bool() .must( f.match().onField( "field1" ).matching( FIELD1_VALUE1 ).toPredicate() ); .must( f.match().onField( "field2" ).matching( FIELD1_VALUE2 ).toPredicate() ); .toPredicate() } ) .build(); ... which is a bit more verbose, but much safer, since the "factory", here named "f", can be used anywhere without risking runtime exceptions just because of where it is used. Commit: 95ec563af0f3d4e43d8b8d3c2ba705700b65bd45 https://github.com/hibernate/hibernate-search/commit/95ec563af0f3d4e43d8b... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/ElasticsearchSearchPredicateContainerContext.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/ElasticsearchSearchPredicateFactoryContext.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/impl/ElasticsearchSearchPredicateContainerContextImpl.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/impl/ElasticsearchSearchPredicateFactoryContextImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/predicate/impl/JsonStringPredicateContextImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/sort/impl/ElasticsearchSearchSortContainerContextImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/extraction/impl/ObjectHitExtractor.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/extraction/impl/ReferenceHitExtractor.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/predicate/impl/ElasticsearchSearchPredicateBuilderFactory.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/predicate/impl/ElasticsearchSearchPredicateCollector.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/predicate/impl/ElasticsearchSearchPredicateFactory.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/predicate/impl/SearchPredicateBuilderFactoryImpl.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/predicate/impl/SearchPredicateFactoryImpl.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/projection/impl/ElasticsearchSearchProjectionBuilderFactoryImpl.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/projection/impl/ElasticsearchSearchProjectionFactoryImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchTargetContext.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/SearchQueryBuilderFactoryImpl.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/SearchQueryFactoryImpl.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/sort/impl/ElasticsearchSearchSortBuilderFactory.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/sort/impl/ElasticsearchSearchSortCollector.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/sort/impl/ElasticsearchSearchSortFactory.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/sort/impl/SearchSortBuilderFactoryImpl.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/sort/impl/SearchSortFactoryImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java R backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/LuceneSearchPredicateContainerContext.java A backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/LuceneSearchPredicateFactoryContext.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/impl/LuceneQueryPredicateContextImpl.java R backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/impl/LuceneSearchPredicateContainerContextImpl.java A backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/predicate/impl/LuceneSearchPredicateFactoryContextImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/sort/impl/LuceneSearchSortContainerContextImpl.java A backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/LuceneSearchPredicateBuilderFactory.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/LuceneSearchPredicateCollector.java R backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/LuceneSearchPredicateFactory.java A backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/SearchPredicateBuilderFactoryImpl.java R backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/SearchPredicateFactoryImpl.java A backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/projection/impl/LuceneSearchProjectionBuilderFactoryImpl.java R backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/projection/impl/LuceneSearchProjectionFactoryImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchTargetContext.java A backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/SearchQueryBuilderFactoryImpl.java R backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/SearchQueryFactoryImpl.java A backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortBuilderFactory.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortCollector.java R backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/LuceneSearchSortFactory.java A backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/SearchSortBuilderFactoryImpl.java R backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/sort/impl/SearchSortFactoryImpl.java M engine/src/main/java/org/hibernate/search/engine/backend/document/model/dsl/IndexSchemaFieldContextExtension.java M engine/src/main/java/org/hibernate/search/engine/backend/document/model/dsl/ObjectFieldStorage.java M engine/src/main/java/org/hibernate/search/engine/backend/index/spi/IndexSearchTarget.java M engine/src/main/java/org/hibernate/search/engine/backend/index/spi/IndexSearchTargetBase.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/BooleanJunctionPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchAllPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchPredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFieldSetContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFromContext.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContext.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContextExtension.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerExtensionContext.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateFactoryContext.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateFactoryContextExtension.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateFactoryExtensionContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/BooleanJunctionPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchAllPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MatchPredicateFieldSetContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/MultiFieldPredicateCommonState.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/NestedPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RangePredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/RangePredicateFieldSetContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateContainerContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateContainerExtensionContextImpl.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateFactoryContextImpl.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateFactoryExtensionContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SpatialPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SpatialWithinPredicateContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SpatialWithinPredicateFieldSetContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/AbstractSearchPredicateTerminalContext.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/DelegatingSearchPredicateContainerContextImpl.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/DelegatingSearchPredicateFactoryContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/SearchProjectionContainerContext.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/SearchProjectionFactoryContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/impl/DistanceToFieldProjectionContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/impl/DocumentReferenceProjectionContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/impl/FieldProjectionContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/impl/ObjectProjectionContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/impl/ReferenceProjectionContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/impl/ScoreProjectionContextImpl.java R engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/impl/SearchProjectionContainerContextImpl.java A engine/src/main/java/org/hibernate/search/engine/search/dsl/projection/impl/SearchProjectionFactoryContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/SearchQueryResultContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryPredicateCollector.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQuerySortCollector.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/SearchQueryWrappingDefinitionResultContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/query/spi/SearchQueryResultDefinitionContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortContainerContextExtension.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/DistanceSortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/FieldSortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/RootSearchSortDslContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/ScoreSortContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchSortContainerContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchSortContainerExtensionContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/impl/SearchTargetSortRootContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/spi/SearchTargetContext.java A engine/src/main/java/org/hibernate/search/engine/search/predicate/spi/SearchPredicateBuilderFactory.java R engine/src/main/java/org/hibernate/search/engine/search/predicate/spi/SearchPredicateFactory.java A engine/src/main/java/org/hibernate/search/engine/search/projection/spi/SearchProjectionBuilderFactory.java R engine/src/main/java/org/hibernate/search/engine/search/projection/spi/SearchProjectionFactory.java A engine/src/main/java/org/hibernate/search/engine/search/query/spi/SearchQueryBuilderFactory.java R engine/src/main/java/org/hibernate/search/engine/search/query/spi/SearchQueryFactory.java A engine/src/main/java/org/hibernate/search/engine/search/sort/spi/SearchSortBuilderFactory.java R engine/src/main/java/org/hibernate/search/engine/search/sort/spi/SearchSortFactory.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/impl/FullTextSearchTargetImpl.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/jpa/FullTextSearchTarget.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/impl/HibernateOrmSearchTargetImpl.java M mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/mapping/PojoSearchTarget.java M mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/mapping/impl/PojoSearchTargetDelegateImpl.java M util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/index/impl/StubIndexSearchTarget.java A util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/index/impl/StubSearchQueryBuilderFactory.java R util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/index/impl/StubSearchQueryFactory.java A util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/predicate/impl/StubSearchPredicateBuilderFactory.java R util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/predicate/impl/StubSearchPredicateFactory.java A util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/projection/StubSearchProjectionBuilderFactory.java R util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/projection/StubSearchProjectionFactory.java A util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/sort/StubSearchSortBuilderFactory.java R util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/sort/StubSearchSortFactory.java Log Message: ----------- HSEARCH-3290 Rename the Predicate/Projection ContainerContexts to FactoryContexts Because these contexts no longer hold a reference to the predicate/projection being built, to they really are closer to factories. Also, rename the SearchPredicateFactory and similar SPI interfaces to SearchPredicate*Builder*Factory, to try and avoid confusions. Commit: 8f4e04f13b1a17e3ad1e5a8777534ad86fafbc64 https://github.com/hibernate/hibernate-search/commit/8f4e04f13b1a17e3ad1e... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/BooleanJunctionPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchAllPredicateContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/MultiTenancyIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/ObjectFieldStorageIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/SmokeIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/BoolSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchAllSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/NestedSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinBoundingBoxSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinCircleSearchPredicateIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinPolygonSearchPredicateIT.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/lambda/LambdaSyntaxDocumentDao.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxDocumentDao.java Log Message: ----------- HSEARCH-3290 Allow to omit the .toPredicate() call for predicates inside other predicates Commit: 2a66bd2e520f04f588e792c3b1bb6a48560aaeb2 https://github.com/hibernate/hibernate-search/commit/2a66bd2e520f04f588e7... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateFactoryContext.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/SearchPredicateFactoryContextImpl.java M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/spi/DelegatingSearchPredicateFactoryContextImpl.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java M integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/BoolSearchPredicateIT.java M integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/lambda/LambdaSyntaxDocumentDao.java Log Message: ----------- HSEARCH-3290 Return a SearchPredicate directly from bool(Consumer<? super BooleanJunctionPredicateContext> clauseContributor) This should make using this method at the root of the predicate tree easier. Commit: b143ac388dd474bfa5c96f15152f23e200403aaa https://github.com/hibernate/hibernate-search/commit/b143ac388dd474bfa5c9... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-02 (Fri, 02 Nov 2018) Changed paths: M engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/impl/BooleanJunctionPredicateContextImpl.java Log Message: ----------- HSEARCH-3290 Remove unnecessary OccurContext class from BooleanJunctionPredicateContextImpl We don't need it anymore, now that we expect to be passed fully-defined predicates to the must()/should()/etc. methods. Compare: https://github.com/hibernate/hibernate-search/compare/5e7692ba1f89...b143... **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.