Merge pull request #12790 from yrodiere/search-renaming

Rename extension hibernate-search-elasticsearch to hibernate-search-orm-elasticsearch

.github/boring-cyborg.yml

@@ -127,8 +127,8 @@ labelPRBasedOnFilePath:
         - integration-tests/spring-data-jpa/**/*
 
     area/hibernate-search:
-        - extensions/hibernate-search-elasticsearch/**/*
-        - integration-tests/hibernate-search-elasticsearch/**/*
+        - extensions/hibernate-search-orm-elasticsearch/**/*
+        - integration-tests/hibernate-search-orm-elasticsearch/**/*
         - extensions/elasticsearch-rest-client/**/*
 
     area/hibernate-validator:

.github/workflows/ci-actions.yml

@@ -464,7 +464,7 @@ jobs:
             test-modules: >
               elasticsearch-rest-client
               elasticsearch-rest-high-level-client
-              hibernate-search-elasticsearch
+              hibernate-search-orm-elasticsearch
           - category: Amazon
             amazonServices: "true"
             timeout: 45

bom/application/pom.xml

@@ -792,12 +792,12 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
+                <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-hibernate-search-elasticsearch-deployment</artifactId>
+                <artifactId>quarkus-hibernate-search-orm-elasticsearch-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

devtools/platform-descriptor-json/src/test/resources/fakeextensions.json

@@ -325,7 +325,7 @@
         },
         {
             "name": "Hibernate Search + Elasticsearch",
-            "guide": "https://quarkus.io/guides/hibernate-search-elasticsearch",
+            "guide": "https://quarkus.io/guides/hibernate-search-orm-elasticsearch",
             "metadata": {
                 "keywords": [
                     "hibernate-search-elasticsearch",
@@ -336,7 +336,7 @@
                 ]
             },
             "group-id": "io.quarkus",
-            "artifact-id": "quarkus-hibernate-search-elasticsearch",
+            "artifact-id": "quarkus-hibernate-search-orm-elasticsearch",
             "version": "999-SNAPSHOT",
             "description": "Automatically index your Hibernate entities in Elasticsearch"
         },

docs/src/main/asciidoc/elasticsearch.adoc

@@ -380,11 +380,11 @@ In this example you can note the following:
 
 == Hibernate Search Elasticsearch
 
-Quarkus supports Hibernate Search with Elasticsearch via the `hibernate-search-elasticsearch` extension.
+Quarkus supports Hibernate Search with Elasticsearch via the `hibernate-search-orm-elasticsearch` extension.
 
 Hibernate Search Elasticsearch allows to synchronize your JPA entities to an Elasticsearch cluster and offers a way to query your Elasticsearch cluster using the Hibernate Search API.
 
-If you're interested in it, you can read the link:hibernate-search-elasticsearch[Hibernate Search with Elasticsearch guide].
+If you're interested in it, you can read the link:hibernate-search-orm-elasticsearch[Hibernate Search with Elasticsearch guide].
 
 == Cluster Health Check
 

docs/src/main/asciidoc/hibernate-search-elasticsearch.adoc → docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc

@@ -44,7 +44,7 @@ However, you can go right to the completed example.
 
 Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
 
-The solution is located in the `hibernate-search-elasticsearch-quickstart` {quickstarts-tree-url}/hibernate-search-elasticsearch-quickstart[directory].
+The solution is located in the `hibernate-search-orm-elasticsearch-quickstart` {quickstarts-tree-url}/hibernate-search-orm-elasticsearch-quickstart[directory].
 
 [NOTE]
 ====
@@ -59,11 +59,11 @@ First, we need a new project. Create a new project with the following command:
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
-    -DprojectArtifactId=hibernate-search-elasticsearch-quickstart \
+    -DprojectArtifactId=hibernate-search-orm-elasticsearch-quickstart \
     -DclassName="org.acme.hibernate.search.elasticsearch.LibraryResource" \
     -Dpath="/library" \
-    -Dextensions="hibernate-orm-panache, hibernate-search-elasticsearch, resteasy-jsonb, jdbc-postgresql"
-cd hibernate-search-elasticsearch-quickstart
+    -Dextensions="hibernate-orm-panache, hibernate-search-orm-elasticsearch, resteasy-jsonb, jdbc-postgresql"
+cd hibernate-search-orm-elasticsearch-quickstart
 ----
 
 This command generates a Maven structure importing the following extensions:
@@ -73,12 +73,12 @@ This command generates a Maven structure importing the following extensions:
  * Hibernate Search + Elasticsearch,
  * RESTEasy and JSON-B.
 
-If you already have your Quarkus project configured, you can add the `hibernate-search-elasticsearch` extension
+If you already have your Quarkus project configured, you can add the `hibernate-search-orm-elasticsearch` extension
 to your project by running the following command in your project base directory:
 
 [source,bash]
 ----
-./mvnw quarkus:add-extension -Dextensions="hibernate-search-elasticsearch"
+./mvnw quarkus:add-extension -Dextensions="hibernate-search-orm-elasticsearch"
 ----
 
 This will add the following to your `pom.xml`:
@@ -87,7 +87,7 @@ This will add the following to your `pom.xml`:
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
+    <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
 </dependency>
 ----
 
@@ -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.
@@ -582,7 +582,7 @@ For more information about the Hibernate Search extension configuration please r
 Now let's add a simple web page to interact with our `LibraryResource`.
 Quarkus automatically serves static resources located under the `META-INF/resources` directory.
 In the `src/main/resources/META-INF/resources` directory, overwrite the existing `index.html` file with the content from this
-{quickstarts-blob-url}/hibernate-search-elasticsearch-quickstart/src/main/resources/META-INF/resources/index.html[index.html] file.
+{quickstarts-blob-url}/hibernate-search-orm-elasticsearch-quickstart/src/main/resources/META-INF/resources/index.html[index.html] file.
 
 == Automatic import script
 
@@ -648,7 +648,7 @@ As usual with native executable compilation, this operation consumes a lot of me
 It might be safer to stop the two containers while you are building the native executable and start them again once you are done.
 ====
 
-Running it is as simple as executing `./target/hibernate-search-elasticsearch-quickstart-1.0-SNAPSHOT-runner`.
+Running it is as simple as executing `./target/hibernate-search-orm-elasticsearch-quickstart-1.0-SNAPSHOT-runner`.
 
 You can then point your browser to `http://localhost:8080/` and use your application.
 
@@ -695,4 +695,4 @@ We don't have plans to support the Lucene backend in Quarkus for now.
 [[configuration-reference]]
 == Hibernate Search Configuration Reference
 
-include::{generated-dir}/config/quarkus-hibernate-search-elasticsearch.adoc[leveloffset=+1, opts=optional]
+include::{generated-dir}/config/quarkus-hibernate-search-orm-elasticsearch.adoc[leveloffset=+1, opts=optional]

docs/src/main/asciidoc/native-and-ssl.adoc

@@ -77,7 +77,7 @@ As SSL is de facto the standard nowadays, we decided to enable its support autom
 
  * the Agroal connection pooling extension (`quarkus-agroal`),
  * the Amazon DynamoDB extension (`quarkus-amazon-dynamodb`),
- * the Hibernate Search Elasticsearch extension (`quarkus-hibernate-search-elasticsearch`),
+ * the Hibernate Search Elasticsearch extension (`quarkus-hibernate-search-orm-elasticsearch`),
  * the Infinispan Client extension (`quarkus-infinispan-client`).
  * the Jaeger extension (`quarkus-jaeger`),
  * the JGit extension (`quarkus-jgit`),

extensions/hibernate-search-elasticsearch/deployment/pom.xml → extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml

@@ -3,15 +3,15 @@
          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">
     <parent>
-        <artifactId>quarkus-hibernate-search-elasticsearch-parent</artifactId>
+        <artifactId>quarkus-hibernate-search-orm-elasticsearch-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-hibernate-search-elasticsearch-deployment</artifactId>
-    <name>Quarkus - Hibernate Search - Elasticsearch - Deployment</name>
+    <artifactId>quarkus-hibernate-search-orm-elasticsearch-deployment</artifactId>
+    <name>Quarkus - Hibernate Search - ORM + Elasticsearch - Deployment</name>
 
     <dependencies>
         <dependency>
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
+            <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
         </dependency>
 
         <!-- test dependencies -->

extensions/hibernate-search-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchElasticsearchProcessor.java → 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.");
             }
         }
 

extensions/hibernate-search-elasticsearch/pom.xml → extensions/hibernate-search-orm-elasticsearch/pom.xml

@@ -10,8 +10,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-hibernate-search-elasticsearch-parent</artifactId>
-    <name>Quarkus - Hibernate Search - Elasticsearch</name>
+    <artifactId>quarkus-hibernate-search-orm-elasticsearch-parent</artifactId>
+    <name>Quarkus - Hibernate Search - ORM + Elasticsearch</name>
     <packaging>pom</packaging>
     <modules>
         <module>deployment</module>

extensions/hibernate-search-elasticsearch/runtime/pom.xml → extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml

@@ -3,15 +3,15 @@
          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">
     <parent>
-        <artifactId>quarkus-hibernate-search-elasticsearch-parent</artifactId>
+        <artifactId>quarkus-hibernate-search-orm-elasticsearch-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
-    <name>Quarkus - Hibernate Search - Elasticsearch - Runtime</name>
+    <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
+    <name>Quarkus - Hibernate Search - ORM + Elasticsearch - Runtime</name>
     <description>Automatically index your Hibernate entities in Elasticsearch</description>
     <dependencies>
         <dependency>

extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java → 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 {
 
     /**

extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java → 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 {
         /**

extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml → extensions/hibernate-search-orm-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml

@@ -2,12 +2,16 @@
 name: "Hibernate Search + Elasticsearch"
 metadata:
   keywords:
+  - "hibernate-search-orm-elasticsearch"
   - "hibernate-search-elasticsearch"
   - "search"
   - "full-text"
   - "hibernate"
+  - "orm"
+  - "hibernate-orm"
+  - "hibernate-search-orm"
   - "elasticsearch"
-  guide: "https://quarkus.io/guides/hibernate-search-elasticsearch"
+  guide: "https://quarkus.io/guides/hibernate-search-orm-elasticsearch"
   categories:
   - "data"
   status: "preview"

extensions/pom.xml

@@ -94,7 +94,7 @@
         <module>hibernate-reactive</module>
         <module>hibernate-validator</module>
         <module>panache</module>
-        <module>hibernate-search-elasticsearch</module>
+        <module>hibernate-search-orm-elasticsearch</module>
         <module>elasticsearch-rest-client-common</module>
         <module>elasticsearch-rest-client</module>
         <module>elasticsearch-rest-high-level-client</module>

independent-projects/tools/devtools-common/src/test/java/io/quarkus/test/platform/descriptor/loader/QuarkusTestPlatformDescriptorLoader.java

@@ -56,7 +56,7 @@ private static void addExtensions() {
         addExtension("quarkus-scala", "Scala", "url://", "scala");
         addExtension("quarkus-config-yaml", "Config Yaml", "url://", "config-yaml");
         addExtension("quarkus-hibernate-orm-panache", "Hibernate ORM Panache");
-        addExtension("quarkus-hibernate-search-elasticsearch", "Elasticsearch");
+        addExtension("quarkus-hibernate-search-orm-elasticsearch", "Elasticsearch");
         addExtension("quarkus-hibernate-validator", "Hibernate Validator");
         addExtension("quarkus-jdbc-postgresql", "JDBC PostreSQL");
         addExtension("quarkus-jdbc-h2", "JDBC H2");

independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/quarkus-bom/pom.xml

@@ -141,7 +141,7 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
+                <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

integration-tests/hibernate-search-elasticsearch/pom.xml → integration-tests/hibernate-search-orm-elasticsearch/pom.xml

@@ -10,16 +10,16 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-integration-test-hibernate-search-elasticsearch</artifactId>
-    <name>Quarkus - Integration Tests - Hibernate Search + Elasticsearch</name>
+    <artifactId>quarkus-integration-test-hibernate-search-orm-elasticsearch</artifactId>
+    <name>Quarkus - Integration Tests - Hibernate Search ORM + Elasticsearch</name>
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
+            <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -57,7 +57,7 @@
         <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-search-elasticsearch-deployment</artifactId>
+            <artifactId>quarkus-hibernate-search-orm-elasticsearch-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>

integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties

@@ -0,0 +1,16 @@
+quarkus.ssl.native = false
+
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+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-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

integration-tests/pom.xml

@@ -54,7 +54,7 @@
         <module>hibernate-reactive-mysql</module>
         <module>hibernate-reactive-postgresql</module>
         <module>hibernate-reactive-panache</module>
-        <module>hibernate-search-elasticsearch</module>
+        <module>hibernate-search-orm-elasticsearch</module>
         <module>hibernate-tenancy</module>
         <module>hibernate-orm-envers</module>
         <module>vertx-http</module>