[hibernate-commits] [hibernate/hibernate-search] 4b8cf4: HSEARCH-1788 Move all SearchResultAssert methods t...

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-search Commit: 4b8cf4c7bef4e8d0f99abac080c3c1a36d4b4683 https://github.com/hibernate/hibernate-search/commit/4b8cf4c7bef4e8d0f99a... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-08 (Thu, 08 Nov 2018) Changed paths: 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/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 util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/EasyMockUtils.java M util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/NormalizationUtils.java R util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/assertion/AbstractSearchResultAssert.java R util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/assertion/DocumentReferencesSearchResultAssert.java R util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/assertion/ProjectionsSearchResultAssert.java M util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchResultAssert.java Log Message: ----------- HSEARCH-1788 Move all SearchResultAssert methods to a single type This will be more convenient to use, and I don't think there's much of a risk of us picking a method that doesn't match the query result type. Even if we do, the assertion will just fail. Commit: cd5b00f7cdf68f47389422efbf18318c2abf25ca https://github.com/hibernate/hibernate-search/commit/cd5b00f7cdf68f473894... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-08 (Thu, 08 Nov 2018) Changed paths: M util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchResultAssert.java Log Message: ----------- HSEARCH-1788 Add missing @SafeVarargs to test utils Commit: 5db5731b545043ebb501255cefc5f3ab350d73f9 https://github.com/hibernate/hibernate-search/commit/5db5731b545043ebb501... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-08 (Thu, 08 Nov 2018) Changed paths: M util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/assertion/SearchResultAssert.java Log Message: ----------- HSEARCH-1788 Fix an NPE in SearchResultAssert Calling hasHitsExactOrder( someValue, null ) would pass a null array as a second argument, which is obviously not good. Commit: f50cbfc772b75e7d7a983359b9baca383bc6ae9f https://github.com/hibernate/hibernate-search/commit/f50cbfc772b75e7d7a98... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-09 (Fri, 09 Nov 2018) Changed paths: M engine/src/main/java/org/hibernate/search/engine/common/impl/MappedIndexSearchTargetImpl.java M engine/src/main/java/org/hibernate/search/engine/mapper/mapping/spi/MappedIndexSearchTarget.java A engine/src/main/java/org/hibernate/search/engine/search/query/impl/AbstractProjectionHitAggregator.java A engine/src/main/java/org/hibernate/search/engine/search/query/impl/MultipleProjectionsHitAggregator.java R engine/src/main/java/org/hibernate/search/engine/search/query/impl/ProjectionHitAggregator.java A engine/src/main/java/org/hibernate/search/engine/search/query/impl/SingleProjectionHitAggregator.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/SearchMultiIndexIT.java M integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/SearchProjectionIT.java M util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/mapper/StubMappingQueryResultDefinitionContext.java M util/internal/test/src/main/java/org/hibernate/search/util/impl/test/SubTest.java Log Message: ----------- HSEARCH-1788 Add support for single-element, type-safe projections in the backends Note: I had to change some tests and introduce SubTest.expectSuccess to work around problems with wildcard generics. Hopefully when we migrate to JUnit 5 we will be able to write parameterized test methods that declare a generic type parameter, which would remove the need for this hack. Commit: e0f8767b1dbf1ace46d3541fd512431fef977eea https://github.com/hibernate/hibernate-search/commit/e0f8767b1dbf1ace46d3... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-09 (Fri, 09 Nov 2018) Changed paths: 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/smoke/AnnotationMappingSmokeIT.java M integrationtest/mapper/pojo/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/smoke/ProgrammaticMappingSmokeIT.java M mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/dsl/query/JavaBeanQueryResultDefinitionContext.java M mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/dsl/query/impl/JavaBeanQueryResultDefinitionContextImpl.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/hibernate/FullTextQueryResultDefinitionContext.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/jpa/FullTextQueryResultDefinitionContext.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/impl/FullTextQueryResultDefinitionContextImpl.java M mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/mapping/impl/PojoSearchTargetDelegateImpl.java M mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/search/spi/PojoSearchTargetDelegate.java Log Message: ----------- HSEARCH-1788 Add support for single-element, type-safe projections in the POJO mappers Commit: 386a243a903ae9c35863b846f1093ded8c8c93c9 https://github.com/hibernate/hibernate-search/commit/386a243a903ae9c35863... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2018-11-09 (Fri, 09 Nov 2018) Changed paths: 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 M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/SearchQueryBuilderFactoryImpl.java M backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/SearchQueryBuilderFactoryImpl.java M engine/src/main/java/org/hibernate/search/engine/common/impl/MappedIndexSearchTargetImpl.java M engine/src/main/java/org/hibernate/search/engine/mapper/mapping/spi/MappedIndexSearchTarget.java M engine/src/main/java/org/hibernate/search/engine/search/query/spi/SearchQueryBuilderFactory.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/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/providedid/ProvidedIdIT.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 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 M mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/dsl/query/JavaBeanQueryResultDefinitionContext.java M mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/dsl/query/impl/JavaBeanQueryResultDefinitionContextImpl.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/hibernate/FullTextQueryResultDefinitionContext.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/jpa/FullTextQueryResultDefinitionContext.java M mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/impl/FullTextQueryResultDefinitionContextImpl.java M mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/mapping/impl/PojoSearchTargetDelegateImpl.java M mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/search/spi/PojoSearchTargetDelegate.java M util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/index/impl/StubSearchQueryBuilderFactory.java M util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/mapper/StubMappingQueryResultDefinitionContext.java Log Message: ----------- HSEARCH-1788 Use singular for asObject/asReference/etc. methods leading to single-element hits See this conversation: https://github.com/hibernate/hibernate-search/pull/1798#discussion_r23193... Compare: https://github.com/hibernate/hibernate-search/compare/370059eb102d...386a... **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.