From b2f4452903fce9671546b93b783e9096a68c9000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Mon, 19 Oct 2020 12:42:20 +0200 Subject: [PATCH] Rename the configuration prefix for the Hibernate Search extension to 'quarkus.hibernate-search-orm.' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of 'quarkus.hibernate-search.'. Signed-off-by: Yoann Rodière --- .../hibernate-search-orm-elasticsearch.adoc | 10 +++++----- .../HibernateSearchElasticsearchProcessor.java | 2 +- ...ibernateSearchElasticsearchBuildTimeConfig.java | 2 +- .../HibernateSearchElasticsearchRuntimeConfig.java | 6 +++--- .../src/main/resources/application.properties | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc index 78e5406c8f196..e88e51d751a87 100644 --- a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc +++ b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc @@ -552,11 +552,11 @@ quarkus.datasource.jdbc.url=jdbc:postgresql:quarkus_test quarkus.hibernate-orm.database.generation=drop-and-create <3> quarkus.hibernate-orm.sql-load-script=import.sql <4> -quarkus.hibernate-search.elasticsearch.version=7 <5> -quarkus.hibernate-search.elasticsearch.analysis.configurer=org.acme.hibernate.search.elasticsearch.config.AnalysisConfigurer <6> -quarkus.hibernate-search.schema-management.strategy=drop-and-create <7> -quarkus.hibernate-search.elasticsearch.schema-management.required-status=yellow <8> -quarkus.hibernate-search.automatic-indexing.synchronization.strategy=sync <9> +quarkus.hibernate-search-orm.elasticsearch.version=7 <5> +quarkus.hibernate-search-orm.elasticsearch.analysis.configurer=org.acme.hibernate.search.elasticsearch.config.AnalysisConfigurer <6> +quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create <7> +quarkus.hibernate-search-orm.elasticsearch.schema-management.required-status=yellow <8> +quarkus.hibernate-search-orm.automatic-indexing.synchronization.strategy=sync <9> ---- <1> We won't use SSL so we disable it to have a more compact native executable. <2> Let's create a PostgreSQL datasource. diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchElasticsearchProcessor.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchElasticsearchProcessor.java index 9f06943d13e48..c5e6d7aa730b5 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchElasticsearchProcessor.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchElasticsearchProcessor.java @@ -110,7 +110,7 @@ private static void checkConfig(HibernateSearchElasticsearchBuildTimeConfig buil // we validate that the version is present for the default backend if (!buildTimeConfig.defaultBackend.version.isPresent()) { throw new ConfigurationError( - "The Elasticsearch version needs to be defined via the quarkus.hibernate-search.elasticsearch.version property."); + "The Elasticsearch version needs to be defined via the quarkus.hibernate-search-orm.elasticsearch.version property."); } } diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java index 0a3d23e058148..9ff465080665d 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java @@ -12,7 +12,7 @@ import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; -@ConfigRoot(name = "hibernate-search", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED) +@ConfigRoot(name = "hibernate-search-orm", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED) public class HibernateSearchElasticsearchBuildTimeConfig { /** diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java index e96ce0014acc9..89c770eb2e292 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java @@ -21,7 +21,7 @@ import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; -@ConfigRoot(name = "hibernate-search", phase = ConfigPhase.RUN_TIME) +@ConfigRoot(name = "hibernate-search-orm", phase = ConfigPhase.RUN_TIME) public class HibernateSearchElasticsearchRuntimeConfig { /** @@ -360,7 +360,7 @@ public static class ThreadPoolConfig { } // We can't set actual default values in this section, - // otherwise "quarkus.hibernate-search.elasticsearch.index-defaults" will be ignored. + // otherwise "quarkus.hibernate-search-orm.elasticsearch.index-defaults" will be ignored. @ConfigGroup public static class ElasticsearchIndexSchemaManagementConfig { /** @@ -379,7 +379,7 @@ public static class ElasticsearchIndexSchemaManagementConfig { } // We can't set actual default values in this section, - // otherwise "quarkus.hibernate-search.elasticsearch.index-defaults" will be ignored. + // otherwise "quarkus.hibernate-search-orm.elasticsearch.index-defaults" will be ignored. @ConfigGroup public static class ElasticsearchIndexIndexingConfig { /** diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties b/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties index 750172377fa4b..09cbba40176aa 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties @@ -7,10 +7,10 @@ quarkus.datasource.jdbc.max-size=8 quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect quarkus.hibernate-orm.database.generation=drop-and-create -quarkus.hibernate-search.elasticsearch.version=7 -quarkus.hibernate-search.elasticsearch.hosts=${elasticsearch.hosts} -quarkus.hibernate-search.elasticsearch.protocol=${elasticsearch.protocol} -quarkus.hibernate-search.elasticsearch.analysis.configurer=io.quarkus.it.hibernate.search.elasticsearch.search.DefaultITAnalysisConfigurer -quarkus.hibernate-search.elasticsearch.schema-management.required-status=yellow -quarkus.hibernate-search.schema-management.strategy=drop-and-create-and-drop -quarkus.hibernate-search.automatic-indexing.synchronization.strategy=sync +quarkus.hibernate-search-orm.elasticsearch.version=7 +quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts} +quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol} +quarkus.hibernate-search-orm.elasticsearch.analysis.configurer=io.quarkus.it.hibernate.search.elasticsearch.search.DefaultITAnalysisConfigurer +quarkus.hibernate-search-orm.elasticsearch.schema-management.required-status=yellow +quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop +quarkus.hibernate-search-orm.automatic-indexing.synchronization.strategy=sync