diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/deployment/HibernateSearchElasticsearchProcessor.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/deployment/HibernateSearchElasticsearchProcessor.java index b6e12f4db4e49..38fc77ec834b3 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/deployment/HibernateSearchElasticsearchProcessor.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/deployment/HibernateSearchElasticsearchProcessor.java @@ -1,6 +1,9 @@ package io.quarkus.hibernate.search.orm.elasticsearch.deployment; import static io.quarkus.hibernate.search.orm.elasticsearch.deployment.HibernateSearchClasses.INDEXED; +import static io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchRuntimeConfig.backendPropertyKey; +import static io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchRuntimeConfig.elasticsearchVersionPropertyKey; +import static io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchRuntimeConfig.mapperPropertyKey; import java.nio.file.Files; import java.nio.file.Path; @@ -329,35 +332,6 @@ private static void registerClasspathFileFromConfig(String persistenceUnitName, hotDeploymentWatchedFiles.produce(new HotDeploymentWatchedFileBuildItem(classpathFile)); } - private static String elasticsearchVersionPropertyKey(String persistenceUnitName, String backendName) { - return backendPropertyKey(persistenceUnitName, backendName, null, "version"); - } - - private static String mapperPropertyKey(String persistenceUnitName, String radical) { - StringBuilder keyBuilder = new StringBuilder("quarkus.hibernate-search-orm."); - if (!PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) { - keyBuilder.append("\"").append(persistenceUnitName).append("\"."); - } - keyBuilder.append(radical); - return keyBuilder.toString(); - } - - private static String backendPropertyKey(String persistenceUnitName, String backendName, String indexName, String radical) { - StringBuilder keyBuilder = new StringBuilder("quarkus.hibernate-search-orm."); - if (!PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) { - keyBuilder.append(persistenceUnitName).append("."); - } - keyBuilder.append("elasticsearch."); - if (backendName != null) { - keyBuilder.append("\"").append(backendName).append("\"."); - } - if (indexName != null) { - keyBuilder.append("indexes.\"").append(indexName).append("\"."); - } - keyBuilder.append(radical); - return keyBuilder.toString(); - } - private void registerReflectionForGson(BuildProducer reflectiveClass) { String[] reflectiveClasses = GsonClasses.typesRequiringReflection().toArray(String[]::new); reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, reflectiveClasses)); diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java index 759e885b4a83b..599c77ed73693 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java @@ -2,6 +2,7 @@ import java.util.Map; +import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil; import io.quarkus.runtime.annotations.ConfigDocMapKey; import io.quarkus.runtime.annotations.ConfigDocSection; import io.quarkus.runtime.annotations.ConfigItem; @@ -25,4 +26,32 @@ public class HibernateSearchElasticsearchRuntimeConfig { @ConfigItem(name = ConfigItem.PARENT) public Map persistenceUnits; + public static String elasticsearchVersionPropertyKey(String persistenceUnitName, String backendName) { + return backendPropertyKey(persistenceUnitName, backendName, null, "version"); + } + + public static String mapperPropertyKey(String persistenceUnitName, String radical) { + StringBuilder keyBuilder = new StringBuilder("quarkus.hibernate-search-orm."); + if (!PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) { + keyBuilder.append("\"").append(persistenceUnitName).append("\"."); + } + keyBuilder.append(radical); + return keyBuilder.toString(); + } + + public static String backendPropertyKey(String persistenceUnitName, String backendName, String indexName, String radical) { + StringBuilder keyBuilder = new StringBuilder("quarkus.hibernate-search-orm."); + if (!PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) { + keyBuilder.append(persistenceUnitName).append("."); + } + keyBuilder.append("elasticsearch."); + if (backendName != null) { + keyBuilder.append("\"").append(backendName).append("\"."); + } + if (indexName != null) { + keyBuilder.append("indexes.\"").append(indexName).append("\"."); + } + keyBuilder.append(radical); + return keyBuilder.toString(); + } }