Branch: refs/heads/main Home: https://github.com/hibernate/hibernate-search Commit: 0c4833514bcebb50ef2bcf7cae9a7e46f840d032 https://github.com/hibernate/hibernate-search/commit/0c4833514bcebb50ef2b... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/cfg/ElasticsearchIndexSettings.java Log Message: ----------- HSEARCH-4253 Add index property SCHEMA_MANAGEMENT_MAPPINGS_FILE Commit: 149d0cb2235d28dd6c0f09f693b00d1a0cf649de https://github.com/hibernate/hibernate-search/commit/149d0cb2235d28dd6c0f... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexRootBuilder.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/impl/ElasticsearchBackendImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/Log.java Log Message: ----------- HSEARCH-4253 Load custom index mappings Commit: b81e1cef0cb771a1942fb0438a4573c6f1522d1a https://github.com/hibernate/hibernate-search/commit/b81e1cef0cb771a1942f... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/custom/ElasticsearchCustomIndexMappingsIT.java A integrationtest/backend/elasticsearch/src/test/resources/custom-index-mappings/no-conflicts.json Log Message: ----------- HSEARCH-4253 Test mappings with no conflicts Commit: 0ce18560db1b83ffbb53af741843b83e0bd45033 https://github.com/hibernate/hibernate-search/commit/0ce18560db1b83ffbb53... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/custom/ElasticsearchCustomIndexMappingsIT.java Log Message: ----------- HSEARCH-4253 Spy mappings with no conflicts Commit: fdbef456511970d26c9a500f548656e778cd4e76 https://github.com/hibernate/hibernate-search/commit/fdbef456511970d26c9a... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexObjectFieldBuilder.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexRootBuilder.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexValueFieldBuilder.java Log Message: ----------- HSEARCH-4253 Merge mappings properties conflicts Commit: aef61d54937c6459c65e8f15c687549874115b1a https://github.com/hibernate/hibernate-search/commit/aef61d54937c6459c65e... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/custom/ElasticsearchCustomIndexMappingsIT.java A integrationtest/backend/elasticsearch/src/test/resources/custom-index-mappings/simple-conflicts.json Log Message: ----------- HSEARCH-4253 Test mappings with simple conflicts Commit: b494a9770919e4605aeb96b3ddc5dfdbae264b7d https://github.com/hibernate/hibernate-search/commit/b494a9770919e4605aeb... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/custom/ElasticsearchCustomIndexComplexMappingsIT.java A integrationtest/backend/elasticsearch/src/test/resources/custom-index-mappings/complex-conflicts-merged.json A integrationtest/backend/elasticsearch/src/test/resources/custom-index-mappings/complex-conflicts.json Log Message: ----------- HSEARCH-4253 Test mappings with complex conflicts Commit: 64795a30a46c28840b2e4cc2770b73bb4f4310b2 https://github.com/hibernate/hibernate-search/commit/64795a30a46c28840b2e... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: R integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/custom/ElasticsearchCustomIndexComplexMappingsIT.java R integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/custom/ElasticsearchCustomIndexMappingsIT.java A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerCreationCustomMappingsIT.java R integrationtest/backend/elasticsearch/src/test/resources/custom-index-mappings/complex-conflicts-merged.json R integrationtest/backend/elasticsearch/src/test/resources/custom-index-mappings/no-conflicts.json A integrationtest/backend/elasticsearch/src/test/resources/custom-index-mappings/no-overlapping.json R integrationtest/backend/elasticsearch/src/test/resources/custom-index-mappings/simple-conflicts.json Log Message: ----------- HSEARCH-4253 Test schema creation with custom mappings Using the same structure we use for other cases Commit: 13daa27ae742745b0a13db7767903c3a748319e4 https://github.com/hibernate/hibernate-search/commit/13daa27ae742745b0a13... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerUpdateCustomMappingsIT.java Log Message: ----------- HSEARCH-4253 Test schema update with custom mappings Commit: fb5b6785409fab3403b0cc3da1c9d54afffc1c81 https://github.com/hibernate/hibernate-search/commit/fb5b6785409fab3403b0... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M documentation/src/main/asciidoc/reference/backend-elasticsearch.asciidoc A documentation/src/test/resources/custom/index-mappings.json Log Message: ----------- HSEARCH-4253 Document custom mappings properly Commit: 1ebe0749733e8ee04161f65617a016a6ccc55772 https://github.com/hibernate/hibernate-search/commit/1ebe0749733e8ee04161... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M documentation/src/main/asciidoc/reference/backend-elasticsearch.asciidoc Log Message: ----------- HSEARCH-4234 Document how to disable source field Commit: dad3347f5b926e6ca9ac44eb3891852cc3930dea https://github.com/hibernate/hibernate-search/commit/dad3347f5b926e6ca9ac... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/cfg/ElasticsearchIndexSettings.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/impl/ElasticsearchBackendImpl.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/Log.java M documentation/src/main/asciidoc/reference/backend-elasticsearch.asciidoc A documentation/src/test/resources/custom/index-settings-merged.json Log Message: ----------- HSEARCH-4253 Apply suggestions from code review Co-authored-by: Yoann Rodière <yoann(a)hibernate.org&gt; Commit: aaf67e7d937c3273c799a836956d858f856ae3f0 https://github.com/hibernate/hibernate-search/commit/aaf67e7d937c3273c799... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M documentation/src/main/asciidoc/reference/backend-elasticsearch.asciidoc A documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/mapping/ElasticsearchCustomIndexMappingIT.java A documentation/src/test/resources/custom/index-mapping-merged.json R documentation/src/test/resources/custom/index-settings-merged.json Log Message: ----------- HSEARCH-4253 Test merged mapping presented in the doc Commit: ba7762c1d1b45eb73b7e7799e95b9ba4041439fe https://github.com/hibernate/hibernate-search/commit/ba7762c1d1b45eb73b7e... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/cfg/ElasticsearchIndexSettings.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexRootBuilder.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/impl/ElasticsearchBackendImpl.java M documentation/src/main/asciidoc/reference/backend-elasticsearch.asciidoc M documentation/src/test/java/org/hibernate/search/documentation/backend/elasticsearch/mapping/ElasticsearchCustomIndexMappingIT.java A documentation/src/test/resources/custom/index-mapping.json R documentation/src/test/resources/custom/index-mappings.json A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerCreationCustomMappingIT.java R integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerCreationCustomMappingsIT.java A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerUpdateCustomMappingIT.java R integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerUpdateCustomMappingsIT.java A integrationtest/backend/elasticsearch/src/test/resources/custom-index-mapping/complex-conflicts.json A integrationtest/backend/elasticsearch/src/test/resources/custom-index-mapping/no-overlapping.json R integrationtest/backend/elasticsearch/src/test/resources/custom-index-mappings/complex-conflicts.json R integrationtest/backend/elasticsearch/src/test/resources/custom-index-mappings/no-overlapping.json Log Message: ----------- HSEARCH-4253 Use mapping singular term Commit: f8cc979843a72bb287304417152f42c3911b46d5 https://github.com/hibernate/hibernate-search/commit/f8cc979843a72bb28730... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexObjectFieldBuilder.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexRootBuilder.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/lowlevel/index/mapping/impl/AbstractTypeMapping.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/lowlevel/index/mapping/impl/RootTypeMapping.java M documentation/src/test/resources/custom/index-mapping-merged.json M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerCreationCustomMappingIT.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerUpdateCustomMappingIT.java Log Message: ----------- HSEARCH-4253 Merge mapping base attributes Commit: 92ca38a551b73ba294ce257f2541cd7714ad8000 https://github.com/hibernate/hibernate-search/commit/92ca38a551b73ba294ce... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/ElasticsearchEventContextMessages.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/ElasticsearchEventContexts.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/validation/impl/AbstractTypeMappingValidator.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/validation/impl/ElasticsearchValidationMessages.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/validation/impl/ValidationContextType.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/validation/impl/ValidationErrorCollector.java A integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerValidationCustomMappingIT.java Log Message: ----------- HSEARCH-4253 Validate mapping extra attributes Commit: a8b1662fd9f9b08454531f400c844f6c19230af1 https://github.com/hibernate/hibernate-search/commit/a8b1662fd9f9b0845453... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexObjectFieldBuilder.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexRootBuilder.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/lowlevel/index/mapping/impl/AbstractTypeMapping.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/lowlevel/index/mapping/impl/RootTypeMapping.java M documentation/src/test/resources/custom/index-mapping-merged.json M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerCreationCustomMappingIT.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerUpdateCustomMappingIT.java M integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerValidationCustomMappingIT.java Log Message: ----------- HSEARCH-4253 Revert merge mapping base attributes Commit: 50aa81479a6be21ba20ce67be1f3a9313868244b https://github.com/hibernate/hibernate-search/commit/50aa81479a6be21ba20c... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/cfg/ElasticsearchIndexSettings.java M documentation/src/main/asciidoc/reference/backend-elasticsearch.asciidoc Log Message: ----------- HSEARCH-4253 Apply suggestions from code review Co-authored-by: Yoann Rodière <yoann(a)hibernate.org&gt; Commit: 0f36e13d2f10449fbadba82130a6d0f8e5150fc2 https://github.com/hibernate/hibernate-search/commit/0f36e13d2f10449fbadb... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M documentation/src/main/asciidoc/reference/backend-elasticsearch.asciidoc Log Message: ----------- HSEARCH-4253 Move documentation under schema mapping Commit: a4b3ef1020d8ac6ba74e2ca57552e5347b8960d2 https://github.com/hibernate/hibernate-search/commit/a4b3ef1020d8ac6ba74e... Author: Fabio Massimo Ercoli <fabiomassimo.ercoli(a)gmail.com&gt; Date: 2021-10-12 (Tue, 12 Oct 2021) Changed paths: M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/mapping/impl/DiscriminatorTypeNameMapping.java M backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/multitenancy/impl/DiscriminatorMultiTenancyStrategy.java Log Message: ----------- HSEARCH-4253 Override Search reserved properties if they are present in the custom mapping provided by the user Compare: https://github.com/hibernate/hibernate-search/compare/2a6e62587c5f...a4b3...