From 1c43f902c95818cb5620cdb5788a1e1927e60ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Mon, 4 Nov 2024 11:13:43 +0100 Subject: [PATCH] Rename quarkus-hibernate-search-backend-elasticsearch to quarkus-hibernate-search-backend-elasticsearch-common --- bom/application/pom.xml | 4 ++-- devtools/bom-descriptor-json/pom.xml | 2 +- docs/pom.xml | 2 +- .../deployment/pom.xml | 6 +++--- ...nateSearchBackendElasticsearchEnabledBuildItem.java | 6 +++--- .../HibernateSearchBackendElasticsearchProcessor.java | 6 +++--- .../pom.xml | 2 +- .../runtime/pom.xml | 4 ++-- .../runtime/ElasticsearchVersionSubstitution.java | 2 +- ...rnateSearchBackendElasticsearchBuildTimeConfig.java | 2 +- ...bernateSearchBackendElasticsearchConfigHandler.java | 10 +++++----- ...bernateSearchBackendElasticsearchRuntimeConfig.java | 2 +- .../common}/runtime/HibernateSearchConfigUtil.java | 2 +- .../elasticsearch/common}/runtime/MapperContext.java | 2 +- .../src/main/resources/META-INF/quarkus-extension.yaml | 0 .../deployment/pom.xml | 2 +- .../HibernateSearchElasticsearchProcessor.java | 4 ++-- .../hibernate-search-orm-elasticsearch/runtime/pom.xml | 2 +- .../runtime/HibernateSearchConfigUtil.java | 2 +- ...rchElasticsearchBuildTimeConfigPersistenceUnit.java | 2 +- .../runtime/HibernateSearchElasticsearchRecorder.java | 4 ++-- ...earchElasticsearchRuntimeConfigPersistenceUnit.java | 2 +- .../HibernateSearchOrmElasticsearchMapperContext.java | 2 +- .../deployment/pom.xml | 2 +- .../deployment/HibernateSearchStandaloneProcessor.java | 4 ++-- .../runtime/pom.xml | 2 +- .../HibernateSearchStandaloneBuildTimeConfig.java | 2 +- ...nateSearchStandaloneElasticsearchMapperContext.java | 2 +- .../runtime/HibernateSearchStandaloneRecorder.java | 4 ++-- .../HibernateSearchStandaloneRuntimeConfig.java | 2 +- extensions/pom.xml | 2 +- 31 files changed, 46 insertions(+), 46 deletions(-) rename extensions/{hibernate-search-backend-elasticsearch => hibernate-search-backend-elasticsearch-common}/deployment/pom.xml (92%) rename extensions/{hibernate-search-backend-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch => hibernate-search-backend-elasticsearch-common/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common}/deployment/HibernateSearchBackendElasticsearchEnabledBuildItem.java (74%) rename extensions/{hibernate-search-backend-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch => hibernate-search-backend-elasticsearch-common/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common}/deployment/HibernateSearchBackendElasticsearchProcessor.java (96%) rename extensions/{hibernate-search-backend-elasticsearch => hibernate-search-backend-elasticsearch-common}/pom.xml (88%) rename extensions/{hibernate-search-backend-elasticsearch => hibernate-search-backend-elasticsearch-common}/runtime/pom.xml (94%) rename extensions/{hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch => hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common}/runtime/ElasticsearchVersionSubstitution.java (86%) rename extensions/{hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch => hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common}/runtime/HibernateSearchBackendElasticsearchBuildTimeConfig.java (98%) rename extensions/{hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch => hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common}/runtime/HibernateSearchBackendElasticsearchConfigHandler.java (96%) rename extensions/{hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch => hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common}/runtime/HibernateSearchBackendElasticsearchRuntimeConfig.java (99%) rename extensions/{hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch => hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common}/runtime/HibernateSearchConfigUtil.java (98%) rename extensions/{hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch => hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common}/runtime/MapperContext.java (91%) rename extensions/{hibernate-search-backend-elasticsearch => hibernate-search-backend-elasticsearch-common}/runtime/src/main/resources/META-INF/quarkus-extension.yaml (100%) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index a1c862ffce373..eb0d906879f3a 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -1377,12 +1377,12 @@ io.quarkus - quarkus-hibernate-search-backend-elasticsearch + quarkus-hibernate-search-backend-elasticsearch-common ${project.version} io.quarkus - quarkus-hibernate-search-backend-elasticsearch-deployment + quarkus-hibernate-search-backend-elasticsearch-common-deployment ${project.version} diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml index d409a5bcc103b..fde9600b26e9a 100644 --- a/devtools/bom-descriptor-json/pom.xml +++ b/devtools/bom-descriptor-json/pom.xml @@ -956,7 +956,7 @@ io.quarkus - quarkus-hibernate-search-backend-elasticsearch + quarkus-hibernate-search-backend-elasticsearch-common ${project.version} pom test diff --git a/docs/pom.xml b/docs/pom.xml index de10454d81a90..c4c5eb2f622b9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -967,7 +967,7 @@ io.quarkus - quarkus-hibernate-search-backend-elasticsearch-deployment + quarkus-hibernate-search-backend-elasticsearch-common-deployment ${project.version} pom test diff --git a/extensions/hibernate-search-backend-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-backend-elasticsearch-common/deployment/pom.xml similarity index 92% rename from extensions/hibernate-search-backend-elasticsearch/deployment/pom.xml rename to extensions/hibernate-search-backend-elasticsearch-common/deployment/pom.xml index 3ab60b1fdc702..e0633ca755425 100644 --- a/extensions/hibernate-search-backend-elasticsearch/deployment/pom.xml +++ b/extensions/hibernate-search-backend-elasticsearch-common/deployment/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - quarkus-hibernate-search-backend-elasticsearch-parent + quarkus-hibernate-search-backend-elasticsearch-common-parent io.quarkus 999-SNAPSHOT 4.0.0 - quarkus-hibernate-search-backend-elasticsearch-deployment + quarkus-hibernate-search-backend-elasticsearch-common-deployment Quarkus - Hibernate Search - Elasticsearch - Deployment @@ -23,7 +23,7 @@ io.quarkus - quarkus-hibernate-search-backend-elasticsearch + quarkus-hibernate-search-backend-elasticsearch-common diff --git a/extensions/hibernate-search-backend-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/deployment/HibernateSearchBackendElasticsearchEnabledBuildItem.java b/extensions/hibernate-search-backend-elasticsearch-common/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/deployment/HibernateSearchBackendElasticsearchEnabledBuildItem.java similarity index 74% rename from extensions/hibernate-search-backend-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/deployment/HibernateSearchBackendElasticsearchEnabledBuildItem.java rename to extensions/hibernate-search-backend-elasticsearch-common/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/deployment/HibernateSearchBackendElasticsearchEnabledBuildItem.java index edc55719aeed2..9a2b8b4d037a6 100644 --- a/extensions/hibernate-search-backend-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/deployment/HibernateSearchBackendElasticsearchEnabledBuildItem.java +++ b/extensions/hibernate-search-backend-elasticsearch-common/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/deployment/HibernateSearchBackendElasticsearchEnabledBuildItem.java @@ -1,10 +1,10 @@ -package io.quarkus.hibernate.search.backend.elasticsearch.deployment; +package io.quarkus.hibernate.search.backend.elasticsearch.common.deployment; import java.util.Map; import io.quarkus.builder.item.MultiBuildItem; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchBackendElasticsearchBuildTimeConfig; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.MapperContext; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchBackendElasticsearchBuildTimeConfig; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.MapperContext; public final class HibernateSearchBackendElasticsearchEnabledBuildItem extends MultiBuildItem { diff --git a/extensions/hibernate-search-backend-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/deployment/HibernateSearchBackendElasticsearchProcessor.java b/extensions/hibernate-search-backend-elasticsearch-common/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/deployment/HibernateSearchBackendElasticsearchProcessor.java similarity index 96% rename from extensions/hibernate-search-backend-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/deployment/HibernateSearchBackendElasticsearchProcessor.java rename to extensions/hibernate-search-backend-elasticsearch-common/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/deployment/HibernateSearchBackendElasticsearchProcessor.java index 8c30887e57411..92cde248d1126 100644 --- a/extensions/hibernate-search-backend-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/deployment/HibernateSearchBackendElasticsearchProcessor.java +++ b/extensions/hibernate-search-backend-elasticsearch-common/deployment/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/deployment/HibernateSearchBackendElasticsearchProcessor.java @@ -1,4 +1,4 @@ -package io.quarkus.hibernate.search.backend.elasticsearch.deployment; +package io.quarkus.hibernate.search.backend.elasticsearch.common.deployment; import java.nio.file.Files; import java.nio.file.Path; @@ -20,8 +20,8 @@ import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchBackendElasticsearchBuildTimeConfig; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.MapperContext; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchBackendElasticsearchBuildTimeConfig; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.MapperContext; import io.quarkus.runtime.configuration.ConfigurationException; @BuildSteps diff --git a/extensions/hibernate-search-backend-elasticsearch/pom.xml b/extensions/hibernate-search-backend-elasticsearch-common/pom.xml similarity index 88% rename from extensions/hibernate-search-backend-elasticsearch/pom.xml rename to extensions/hibernate-search-backend-elasticsearch-common/pom.xml index 4a9b715f7d188..6b16ca71abe6c 100644 --- a/extensions/hibernate-search-backend-elasticsearch/pom.xml +++ b/extensions/hibernate-search-backend-elasticsearch-common/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - quarkus-hibernate-search-backend-elasticsearch-parent + quarkus-hibernate-search-backend-elasticsearch-common-parent Quarkus - Hibernate Search - Elasticsearch pom diff --git a/extensions/hibernate-search-backend-elasticsearch/runtime/pom.xml b/extensions/hibernate-search-backend-elasticsearch-common/runtime/pom.xml similarity index 94% rename from extensions/hibernate-search-backend-elasticsearch/runtime/pom.xml rename to extensions/hibernate-search-backend-elasticsearch-common/runtime/pom.xml index 62453cd240336..5479128e11b0b 100644 --- a/extensions/hibernate-search-backend-elasticsearch/runtime/pom.xml +++ b/extensions/hibernate-search-backend-elasticsearch-common/runtime/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - quarkus-hibernate-search-backend-elasticsearch-parent + quarkus-hibernate-search-backend-elasticsearch-common-parent io.quarkus 999-SNAPSHOT 4.0.0 - quarkus-hibernate-search-backend-elasticsearch + quarkus-hibernate-search-backend-elasticsearch-common Quarkus - Hibernate Search - Elasticsearch - Runtime Elasticsearch/OpenSearch backend for use in other Hibernate Search extensions diff --git a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/ElasticsearchVersionSubstitution.java b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/ElasticsearchVersionSubstitution.java similarity index 86% rename from extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/ElasticsearchVersionSubstitution.java rename to extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/ElasticsearchVersionSubstitution.java index dc26810940dd4..5f519234d3329 100644 --- a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/ElasticsearchVersionSubstitution.java +++ b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/ElasticsearchVersionSubstitution.java @@ -1,4 +1,4 @@ -package io.quarkus.hibernate.search.backend.elasticsearch.runtime; +package io.quarkus.hibernate.search.backend.elasticsearch.common.runtime; import org.hibernate.search.backend.elasticsearch.ElasticsearchVersion; diff --git a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchBackendElasticsearchBuildTimeConfig.java b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchBackendElasticsearchBuildTimeConfig.java similarity index 98% rename from extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchBackendElasticsearchBuildTimeConfig.java rename to extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchBackendElasticsearchBuildTimeConfig.java index 7c762fcc70574..97310b905c87e 100644 --- a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchBackendElasticsearchBuildTimeConfig.java +++ b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchBackendElasticsearchBuildTimeConfig.java @@ -1,4 +1,4 @@ -package io.quarkus.hibernate.search.backend.elasticsearch.runtime; +package io.quarkus.hibernate.search.backend.elasticsearch.common.runtime; import java.util.List; import java.util.Map; diff --git a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchBackendElasticsearchConfigHandler.java b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchBackendElasticsearchConfigHandler.java similarity index 96% rename from extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchBackendElasticsearchConfigHandler.java rename to extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchBackendElasticsearchConfigHandler.java index f4ad910bdeef2..062d61c186ad6 100644 --- a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchBackendElasticsearchConfigHandler.java +++ b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchBackendElasticsearchConfigHandler.java @@ -1,8 +1,8 @@ -package io.quarkus.hibernate.search.backend.elasticsearch.runtime; +package io.quarkus.hibernate.search.backend.elasticsearch.common.runtime; -import static io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchConfigUtil.addBackendConfig; -import static io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchConfigUtil.addBackendIndexConfig; -import static io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchConfigUtil.mergeInto; +import static io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchConfigUtil.addBackendConfig; +import static io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchConfigUtil.addBackendIndexConfig; +import static io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchConfigUtil.mergeInto; import java.util.LinkedHashMap; import java.util.Map; @@ -17,7 +17,7 @@ import org.hibernate.search.backend.elasticsearch.index.layout.IndexLayoutStrategy; import org.hibernate.search.engine.cfg.BackendSettings; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchBackendElasticsearchBuildTimeConfig.IndexConfig; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchBackendElasticsearchBuildTimeConfig.IndexConfig; public final class HibernateSearchBackendElasticsearchConfigHandler { diff --git a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchBackendElasticsearchRuntimeConfig.java b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchBackendElasticsearchRuntimeConfig.java similarity index 99% rename from extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchBackendElasticsearchRuntimeConfig.java rename to extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchBackendElasticsearchRuntimeConfig.java index 3dbdcd72dd9f2..0125788d74225 100644 --- a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchBackendElasticsearchRuntimeConfig.java +++ b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchBackendElasticsearchRuntimeConfig.java @@ -1,4 +1,4 @@ -package io.quarkus.hibernate.search.backend.elasticsearch.runtime; +package io.quarkus.hibernate.search.backend.elasticsearch.common.runtime; import java.time.Duration; import java.util.List; diff --git a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchConfigUtil.java b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchConfigUtil.java similarity index 98% rename from extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchConfigUtil.java rename to extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchConfigUtil.java index 069ede0d9f169..46518474b082c 100644 --- a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/HibernateSearchConfigUtil.java +++ b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/HibernateSearchConfigUtil.java @@ -1,4 +1,4 @@ -package io.quarkus.hibernate.search.backend.elasticsearch.runtime; +package io.quarkus.hibernate.search.backend.elasticsearch.common.runtime; import java.util.LinkedHashSet; import java.util.Map; diff --git a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/MapperContext.java b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/MapperContext.java similarity index 91% rename from extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/MapperContext.java rename to extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/MapperContext.java index dc40b68b5a312..91bf5a46b55d4 100644 --- a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/runtime/MapperContext.java +++ b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/java/io/quarkus/hibernate/search/backend/elasticsearch/common/runtime/MapperContext.java @@ -1,4 +1,4 @@ -package io.quarkus.hibernate.search.backend.elasticsearch.runtime; +package io.quarkus.hibernate.search.backend.elasticsearch.common.runtime; import java.util.List; import java.util.Map; diff --git a/extensions/hibernate-search-backend-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml similarity index 100% rename from extensions/hibernate-search-backend-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml rename to extensions/hibernate-search-backend-elasticsearch-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml index 2fc488862a21b..3bc1b3c964d42 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml @@ -27,7 +27,7 @@ io.quarkus - quarkus-hibernate-search-backend-elasticsearch-deployment + quarkus-hibernate-search-backend-elasticsearch-common-deployment io.quarkus 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 db348c894bb11..72d3945b3d6c5 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 @@ -49,8 +49,8 @@ import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil; import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeInitListener; import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticInitListener; -import io.quarkus.hibernate.search.backend.elasticsearch.deployment.HibernateSearchBackendElasticsearchEnabledBuildItem; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.ElasticsearchVersionSubstitution; +import io.quarkus.hibernate.search.backend.elasticsearch.common.deployment.HibernateSearchBackendElasticsearchEnabledBuildItem; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.ElasticsearchVersionSubstitution; import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchBuildTimeConfig; import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit; import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchRecorder; diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml b/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml index 52a352ea787a3..4653413c7abb8 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml @@ -27,7 +27,7 @@ io.quarkus - quarkus-hibernate-search-backend-elasticsearch + quarkus-hibernate-search-backend-elasticsearch-common org.hibernate.search diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchConfigUtil.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchConfigUtil.java index a7589222b7706..90ce860706171 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchConfigUtil.java +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchConfigUtil.java @@ -9,7 +9,7 @@ import org.hibernate.search.engine.cfg.IndexSettings; /** - * @deprecated Use {@link io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchConfigUtil} instead. + * @deprecated Use {@link io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchConfigUtil} instead. */ @Deprecated public class HibernateSearchConfigUtil { diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit.java index b48b48ac3e2f3..965cf0bc1bdee 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit.java +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchBackendElasticsearchBuildTimeConfig; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchBackendElasticsearchBuildTimeConfig; import io.quarkus.runtime.annotations.ConfigDocDefault; import io.quarkus.runtime.annotations.ConfigDocMapKey; import io.quarkus.runtime.annotations.ConfigDocSection; diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java index b30e9034b3bc8..09a44b25e8aec 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.search.orm.elasticsearch.runtime; -import static io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchConfigUtil.addConfig; +import static io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchConfigUtil.addConfig; import java.util.ArrayList; import java.util.Collections; @@ -38,7 +38,7 @@ import io.quarkus.arc.Arc; import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeInitListener; import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticInitListener; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchBackendElasticsearchConfigHandler; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchBackendElasticsearchConfigHandler; import io.quarkus.hibernate.search.orm.elasticsearch.runtime.bean.HibernateSearchBeanUtil; import io.quarkus.hibernate.search.orm.elasticsearch.runtime.management.HibernateSearchManagementHandler; import io.quarkus.hibernate.search.orm.elasticsearch.runtime.mapping.QuarkusHibernateOrmSearchMappingConfigurer; diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfigPersistenceUnit.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfigPersistenceUnit.java index 9c750db8d0340..6817febb71aee 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfigPersistenceUnit.java +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfigPersistenceUnit.java @@ -7,7 +7,7 @@ import org.hibernate.search.mapper.orm.schema.management.SchemaManagementStrategyName; import org.hibernate.search.mapper.orm.search.loading.EntityLoadingCacheLookupStrategy; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchBackendElasticsearchRuntimeConfig; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchBackendElasticsearchRuntimeConfig; import io.quarkus.runtime.annotations.ConfigDocDefault; import io.quarkus.runtime.annotations.ConfigDocMapKey; import io.quarkus.runtime.annotations.ConfigDocSection; diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchOrmElasticsearchMapperContext.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchOrmElasticsearchMapperContext.java index 73a8e8f837100..df08b6028f206 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchOrmElasticsearchMapperContext.java +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchOrmElasticsearchMapperContext.java @@ -7,7 +7,7 @@ import org.hibernate.search.engine.environment.bean.BeanReference; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.MapperContext; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.MapperContext; import io.quarkus.hibernate.search.orm.elasticsearch.runtime.bean.HibernateSearchBeanUtil; import io.quarkus.runtime.annotations.RecordableConstructor; diff --git a/extensions/hibernate-search-standalone-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-standalone-elasticsearch/deployment/pom.xml index 76b5653e6aeed..046916dc99544 100644 --- a/extensions/hibernate-search-standalone-elasticsearch/deployment/pom.xml +++ b/extensions/hibernate-search-standalone-elasticsearch/deployment/pom.xml @@ -23,7 +23,7 @@ io.quarkus - quarkus-hibernate-search-backend-elasticsearch-deployment + quarkus-hibernate-search-backend-elasticsearch-common-deployment io.quarkus diff --git a/extensions/hibernate-search-standalone-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/deployment/HibernateSearchStandaloneProcessor.java b/extensions/hibernate-search-standalone-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/deployment/HibernateSearchStandaloneProcessor.java index f8bde77070d19..dc7dc6f88f6d8 100644 --- a/extensions/hibernate-search-standalone-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/deployment/HibernateSearchStandaloneProcessor.java +++ b/extensions/hibernate-search-standalone-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/deployment/HibernateSearchStandaloneProcessor.java @@ -48,8 +48,8 @@ import io.quarkus.deployment.util.JandexUtil; import io.quarkus.elasticsearch.restclient.common.deployment.DevservicesElasticsearchBuildItem; import io.quarkus.elasticsearch.restclient.common.deployment.ElasticsearchCommonBuildTimeConfig.ElasticsearchDevServicesBuildTimeConfig.Distribution; -import io.quarkus.hibernate.search.backend.elasticsearch.deployment.HibernateSearchBackendElasticsearchEnabledBuildItem; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.ElasticsearchVersionSubstitution; +import io.quarkus.hibernate.search.backend.elasticsearch.common.deployment.HibernateSearchBackendElasticsearchEnabledBuildItem; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.ElasticsearchVersionSubstitution; import io.quarkus.hibernate.search.standalone.elasticsearch.runtime.HibernateSearchStandaloneBuildTimeConfig; import io.quarkus.hibernate.search.standalone.elasticsearch.runtime.HibernateSearchStandaloneElasticsearchMapperContext; import io.quarkus.hibernate.search.standalone.elasticsearch.runtime.HibernateSearchStandaloneRecorder; diff --git a/extensions/hibernate-search-standalone-elasticsearch/runtime/pom.xml b/extensions/hibernate-search-standalone-elasticsearch/runtime/pom.xml index 3d18a2bbcbc70..14d0bf298bdd0 100644 --- a/extensions/hibernate-search-standalone-elasticsearch/runtime/pom.xml +++ b/extensions/hibernate-search-standalone-elasticsearch/runtime/pom.xml @@ -23,7 +23,7 @@ io.quarkus - quarkus-hibernate-search-backend-elasticsearch + quarkus-hibernate-search-backend-elasticsearch-common org.hibernate.search diff --git a/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneBuildTimeConfig.java b/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneBuildTimeConfig.java index 864179eeb3c39..616f87521052a 100644 --- a/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneBuildTimeConfig.java +++ b/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneBuildTimeConfig.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchBackendElasticsearchBuildTimeConfig; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchBackendElasticsearchBuildTimeConfig; import io.quarkus.runtime.annotations.ConfigDocMapKey; import io.quarkus.runtime.annotations.ConfigDocSection; import io.quarkus.runtime.annotations.ConfigGroup; diff --git a/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneElasticsearchMapperContext.java b/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneElasticsearchMapperContext.java index 76bee4893dd37..950d4e0860279 100644 --- a/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneElasticsearchMapperContext.java +++ b/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneElasticsearchMapperContext.java @@ -7,7 +7,7 @@ import org.hibernate.search.engine.environment.bean.BeanReference; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.MapperContext; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.MapperContext; import io.quarkus.hibernate.search.standalone.elasticsearch.runtime.bean.HibernateSearchBeanUtil; import io.quarkus.runtime.annotations.RecordableConstructor; diff --git a/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneRecorder.java b/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneRecorder.java index 507a5369f9a98..9bccbd6789a21 100644 --- a/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneRecorder.java +++ b/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneRecorder.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.search.standalone.elasticsearch.runtime; -import static io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchConfigUtil.addConfig; +import static io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchConfigUtil.addConfig; import java.util.ArrayList; import java.util.Collections; @@ -26,7 +26,7 @@ import io.quarkus.arc.Arc; import io.quarkus.arc.SyntheticCreationalContext; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchBackendElasticsearchConfigHandler; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchBackendElasticsearchConfigHandler; import io.quarkus.hibernate.search.standalone.elasticsearch.runtime.bean.ArcBeanProvider; import io.quarkus.hibernate.search.standalone.elasticsearch.runtime.bean.HibernateSearchBeanUtil; import io.quarkus.hibernate.search.standalone.elasticsearch.runtime.management.HibernateSearchStandaloneManagementHandler; diff --git a/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneRuntimeConfig.java b/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneRuntimeConfig.java index 0a6382d36c601..a8beac6716e7c 100644 --- a/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneRuntimeConfig.java +++ b/extensions/hibernate-search-standalone-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/runtime/HibernateSearchStandaloneRuntimeConfig.java @@ -6,7 +6,7 @@ import org.hibernate.search.mapper.pojo.standalone.schema.management.SchemaManagementStrategyName; -import io.quarkus.hibernate.search.backend.elasticsearch.runtime.HibernateSearchBackendElasticsearchRuntimeConfig; +import io.quarkus.hibernate.search.backend.elasticsearch.common.runtime.HibernateSearchBackendElasticsearchRuntimeConfig; import io.quarkus.runtime.annotations.ConfigDocDefault; import io.quarkus.runtime.annotations.ConfigDocMapKey; import io.quarkus.runtime.annotations.ConfigDocSection; diff --git a/extensions/pom.xml b/extensions/pom.xml index 5f524b2e9d86a..d100f35b60988 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -99,7 +99,7 @@ hibernate-reactive hibernate-validator panache - hibernate-search-backend-elasticsearch + hibernate-search-backend-elasticsearch-common hibernate-search-orm-elasticsearch hibernate-search-orm-outbox-polling hibernate-search-standalone-elasticsearch