[hibernate-commits] [hibernate/hibernate-search] 582290: HSEARCH-3490 Upgrade to elasticsearch-maven-plugin...

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-search Commit: 58229049a15e50193aa9c2f7553910c4d70b0a9b https://github.com/hibernate/hibernate-search/commit/58229049a15e50193aa9... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M pom.xml Log Message: ----------- HSEARCH-3490 Upgrade to elasticsearch-maven-plugin 6.12 Which supports ES7: https://github.com/alexcojocaru/elasticsearch-maven-plugin/pull/85 Commit: 229eb54a7d4c4689ca8da0930f135b9a92426c99 https://github.com/hibernate/hibernate-search/commit/229eb54a7d4c4689ca8d... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M pom.xml A util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/elasticsearch.yml A util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/jvm.options A util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/log4j2.properties A util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/init/init.script Log Message: ----------- HSEARCH-3490 Add a profile in the Maven configuration to test against Elasticsearch 7 Commit: 18bcc3f3342d12bd7521aecad9171265a6557717 https://github.com/hibernate/hibernate-search/commit/18bcc3f3342d12bd7521... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M Jenkinsfile Log Message: ----------- HSEARCH-3490 Add Elasticsearch 7 as an experimental environment in the Jenkinsfile Commit: d57d9990de7e665fa137c751a2db1439a6adfbe9 https://github.com/hibernate/hibernate-search/commit/d57d9990de7e665fa137... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/init/init.script Log Message: ----------- HSEARCH-3490 Use the new syntax for templates in ES6 initialization scripts The old syntax used to work in ES6, but it triggered warnings. It no longer works in ES7. Commit: 7722f55b5fc41855dade2ddcaf7c3433d6ad266c https://github.com/hibernate/hibernate-search/commit/7722f55b5fc41855dade... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/builder/factory/impl/Elasticsearch6WorkBuilderFactory.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/fieldtype/ElasticsearchFieldTypesIT.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/management/ElasticsearchSchemaValidationIT.java A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch5TestDialect.java A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch6TestDialect.java A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch7TestDialect.java A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/ElasticsearchTestDialect.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/util/TestElasticsearchClient.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/work/ElasticsearchIndexingIT.java M pom.xml Log Message: ----------- HSEARCH-3490 Add an Elasticsearch dialect to tests, to also support ES7 which doesn't allow type names in requests It could allow it if we passed a magic parameter, but we know this parameter won't work in future versions of Elasticsearch, so we may as well do things right straight away. Commit: ed84a86f61aecc6fd9c11e2a9ee55411c2e0dc39 https://github.com/hibernate/hibernate-search/commit/ed84a86f61aecc6fd9c1... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/es6/Elasticsearch6Dialect.java Log Message: ----------- HSEARCH-3490 Fix invalid comments in Elasticsearch6Dialect Those comments belong in Elasticsearch56Dialect, but it already has similar comments. Commit: 5e0aef3307095e73dbccd9faea6a5b172391b6d9 https://github.com/hibernate/hibernate-search/commit/5e0aef3307095e73dbcc... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/impl/Paths.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/es6/Elasticsearch6Dialect.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/es7/Elasticsearch7Dialect.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/builder/factory/impl/Elasticsearch6WorkBuilderFactory.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/builder/factory/impl/Elasticsearch7WorkBuilderFactory.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/CreateIndexWork.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/GetIndexTypeMappingWork.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/PutIndexTypeMappingWork.java M backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch5TestDialect.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch6TestDialect.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch7TestDialect.java Log Message: ----------- HSEARCH-3490 Add an Elasticsearch 7 dialect handling the new typename rules ("_doc", ...) See https://www.elastic.co/guide/en/elasticsearch/reference/7.0/removal-of-ty... This breaking change was initially planned for ES8, but they moved it forward... Commit: 4546a922958b47caddaca3ed7a9f38f052b7eb3c https://github.com/hibernate/hibernate-search/commit/4546a922958b47caddac... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialect.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/es6/Elasticsearch6Dialect.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/es7/Elasticsearch7Dialect.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/impl/ElasticsearchBackendFactory.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/impl/ElasticsearchBackendImpl.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/Elasticsearch6SearchResultExtractor.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/Elasticsearch6SearchResultExtractorFactory.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/Elasticsearch7SearchResultExtractor.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/Elasticsearch7SearchResultExtractorFactory.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilder.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchResultExtractorFactory.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchResultExtractorImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/SearchBackendContext.java Log Message: ----------- HSEARCH-3490 Add support for ES7 result formatting (hits.total.value instead of hits.total) Since we need to also support the ES6 formatting, the search result extractor becomes dialect-specific. See https://www.elastic.co/guide/en/elasticsearch/reference/7.0/breaking-chan... Commit: 4b00f46d514bcfd84c844948044c4c520eb9f927 https://github.com/hibernate/hibernate-search/commit/4b00f46d514bcfd84c84... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/builder/factory/impl/Elasticsearch6WorkBuilderFactory.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/builder/factory/impl/Elasticsearch7WorkBuilderFactory.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/ElasticsearchSearchWork.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/SearchWork.java Log Message: ----------- HSEARCH-3490 Ensure we correctly track total hits in ES7 It's suboptimal, but we will improve on this in HSEARCH-3517. Commit: f318a005a71116b1e97319722ee40d188330fba5 https://github.com/hibernate/hibernate-search/commit/f318a005a71116b1e973... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialect.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/es6/Elasticsearch6Dialect.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/es7/Elasticsearch7Dialect.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/impl/ElasticsearchBackendFactory.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/impl/ElasticsearchBackendImpl.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/provider/impl/Elasticsearch6IndexFieldTypeFactoryContextProvider.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/provider/impl/Elasticsearch7IndexFieldTypeFactoryContextProvider.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/provider/impl/ElasticsearchIndexFieldTypeFactoryContextProvider.java Log Message: ----------- HSEARCH-3490 Give Elasticsearch dialects the ability to override index field types Commit: eeb6ab3085b55d725f22a58226b154dcefd9ae46 https://github.com/hibernate/hibernate-search/commit/eeb6ab3085b55d725f22... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M util/common/src/main/java/org/hibernate/search/util/common/impl/CollectionHelper.java Log Message: ----------- HSEARCH-3490 Add an "asImmutableList" method to CollectionHelper Commit: 45337f222cbe573279e05d4354c003008d3760b3 https://github.com/hibernate/hibernate-search/commit/45337f222cbe573279e0... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/codec/impl/AbstractElasticsearchJavaTimeFieldCodec.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/codec/impl/ElasticsearchInstantFieldCodec.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/AbstractElasticsearchIndexFieldTypeConverterContext.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/AbstractElasticsearchTemporalIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchIndexFieldTypeBuildContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchIndexFieldTypeFactoryContextImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchInstantIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchLocalDateIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchLocalDateTimeIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchLocalTimeIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchMonthDayIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchOffsetDateTimeIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchOffsetTimeIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchYearIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchYearMonthIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchZonedDateTimeIndexFieldTypeContext.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/provider/impl/Elasticsearch6IndexFieldTypeFactoryContextProvider.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/provider/impl/Elasticsearch7IndexFieldTypeFactoryContextProvider.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/format/impl/Elasticsearch6DefaultFieldFormatProvider.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/format/impl/Elasticsearch7DefaultFieldFormatProvider.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/format/impl/ElasticsearchDefaultFieldFormatProvider.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/management/ElasticsearchSchemaCreationIT.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/management/ElasticsearchSchemaMigrationIT.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/management/ElasticsearchSchemaValidationIT.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch5TestDialect.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch6TestDialect.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch7TestDialect.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/ElasticsearchTestDialect.java Log Message: ----------- HSEARCH-3490 Use different temporal format definitions for ES7 than for ES6 ES6 accepted the Joda syntax for date format patterns, whereas ES7 switched to the java.time syntax, which is different. See https://www.elastic.co/guide/en/elasticsearch/reference/7.0/breaking-chan... Commit: af8524de15e2497cbe8ef4c68ec83e5ebc4154fb https://github.com/hibernate/hibernate-search/commit/af8524de15e2497cbe8e... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/projection/impl/ElasticsearchDistanceToFieldProjection.java Log Message: ----------- HSEARCH-3490 Use an ES7-compatible syntax to check whether fields have a value in painless scripts See https://www.elastic.co/guide/en/elasticsearch/reference/7.0/breaking-chan... Commit: 141ba678d41a8f89bccd303d8052b9b8a86fb0ab https://github.com/hibernate/hibernate-search/commit/141ba678d41a8f89bccd... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/util/TestElasticsearchClient.java Log Message: ----------- HSEARCH-3490 Fix an invalid payload syntax for settings in TestElasticsearchClient Apparently Elasticsearch used to accept settings at the root of the payload, and no longer does. This was apparently an undocumented feature, though, and the proper way to pass settings has always been to use the "settings" property in the payload. Commit: deb079519ab583f2733786f0eb63cd841bd7e75e https://github.com/hibernate/hibernate-search/commit/deb079519ab583f27337... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ElasticsearchExtensionIT.java Log Message: ----------- HSEARCH-3490 Use a date format that works for both ES6 and ES7 in ElasticsearchExtensionIT Commit: c42afbff8a937b51f433003d5a6fcf238004473c https://github.com/hibernate/hibernate-search/commit/c42afbff8a937b51f433... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch5TestDialect.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch6TestDialect.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/Elasticsearch7TestDialect.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/dialect/ElasticsearchTestDialect.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/testsupport/util/TestElasticsearchClient.java M util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/init/init.script M util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/init/init.script Log Message: ----------- HSEARCH-3490 Avoid the use of the deprecated "template" property in Elasticsearch template API payloads The property was renamed to "index_patterns" in 6.0 and now expects an array of strings. Commit: eb520a9b89bbea680807877f3fd854c8135719ef https://github.com/hibernate/hibernate-search/commit/eb520a9b89bbea680807... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: M Jenkinsfile Log Message: ----------- HSEARCH-3490 Mark Elasticsearch 7 as supported in the Jenkinsfile Commit: de20853f8ffbe172042f44e8ef966b7475050709 https://github.com/hibernate/hibernate-search/commit/de20853f8ffbe172042f... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2019-03-19 (Tue, 19 Mar 2019) Changed paths: A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/Elasticsearch56Dialect.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/Elasticsearch6Dialect.java A backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/Elasticsearch7Dialect.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/es56/Elasticsearch56Dialect.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/es6/Elasticsearch6Dialect.java R backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/es7/Elasticsearch7Dialect.java M backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java Log Message: ----------- HSEARCH-3490 Move all Elasticsearch dialect implementations to a single package We do not need each of them to have its own package, since the related classes (work factory, ...) are implemented in completely different packages, and thus we'll never have a related class in the org.hibernate.search.backend.elasticsearch.dialect.impl.esXX package. Compare: https://github.com/hibernate/hibernate-search/compare/39c9e1a652bd...de20...