[#48] Support Hibernate Search queries

karesti · karesti · commit 685377fa06e2 · 2025-10-02T10:41:23.000+02:00
diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,3 +1,3 @@
 :project-version: 1.1.0
-:infinispan-version: 15.0.15.Final
+:infinispan-version: 15.0.19.Final
 :examples-dir: ./../examples/
diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
@@ -10,6 +10,11 @@ The new *Infinispan Embedded Quarkus extension* simplifies using Infinispan as a
 
 This extension is ideal for developers who want to build high-speed, lightweight applications without the overhead of managing external data services.
 
+[IMPORTANT]
+====
+Native support in this extension is limited and not recommended.
+For native applications, consider using Infinispan in Client/Server mode.
+====
 
 == Quick Overview
 
@@ -113,6 +118,22 @@ as the media type, ensuring compatibility with remote marshalling.
 This approach simplifies development by reducing boilerplate, while still supporting
 custom XML-based configurations when needed.
 
+== Embedded Query
+The Hibernate Search version must match the Infinispan version.
+If necessary, import the Hibernate Search BOM to override the
+Quarkus-provided version.
+
+[source,xml]
+----
+<dependency>
+    <groupId>org.hibernate.search</groupId>
+    <artifactId>hibernate-search-bom</artifactId>
+    <version>7.1.2.Final</version>
+    <type>pom</type>
+    <scope>import</scope>
+</dependency>
+----
+
 == Configuration Settings
 
 include::includes/quarkus-infinispan-embedded.adoc[leveloffset=+1,opts=optional]
diff --git a/extension/deployment/src/main/java/io/quarkiverse/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java b/extension/deployment/src/main/java/io/quarkiverse/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java
@@ -38,6 +38,7 @@
 import org.infinispan.protostream.GeneratedSchema;
 import org.infinispan.protostream.MessageMarshaller;
 import org.infinispan.protostream.SerializationContextInitializer;
+import org.infinispan.protostream.WrappedMessage;
 import org.infinispan.protostream.schema.Schema;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
@@ -92,6 +93,8 @@ void addInfinispanDependencies(BuildProducer<IndexDependencyBuildItem> indexDepe
         indexDependency.produce(new IndexDependencyBuildItem("org.infinispan", "infinispan-cachestore-jdbc-common"));
         indexDependency.produce(new IndexDependencyBuildItem("org.infinispan", "infinispan-cachestore-jdbc"));
         indexDependency.produce(new IndexDependencyBuildItem("org.infinispan", "infinispan-cachestore-sql"));
+        indexDependency.produce(new IndexDependencyBuildItem("org.infinispan", "infinispan-query"));
+        indexDependency.produce(new IndexDependencyBuildItem("org.infinispan", "infinispan-query-core"));
     }
 
     @BuildStep
@@ -104,6 +107,11 @@ ProtobufInitializers setup(BuildProducer<ReflectiveClassBuildItem> reflectiveCla
         additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(InfinispanEmbeddedProducer.class));
         additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(Embedded.class).build());
 
+        resources.produce(new NativeImageResourceBuildItem("proto/generated/persistence.query.core.proto"));
+        resources.produce(new NativeImageResourceBuildItem("proto/generated/persistence.query.proto"));
+        resources.produce(new NativeImageResourceBuildItem("proto/generated/persistence.jdbc.proto"));
+        resources.produce(new NativeImageResourceBuildItem(WrappedMessage.PROTO_FILE));
+
         for (Class<?> serviceLoadedInterface : Arrays.asList(ModuleMetadataBuilder.class, ConfigurationParser.class)) {
             // Need to register all the modules as service providers so they can be picked up at runtime
             ServiceLoader<?> serviceLoader = ServiceLoader.load(serviceLoadedInterface);
@@ -193,9 +201,6 @@ ProtobufInitializers setup(BuildProducer<ReflectiveClassBuildItem> reflectiveCla
         addReflectionForName("org.infinispan.persistence.keymappers.Key2StringMapper", true, combinedIndex, reflectiveClass,
                 false, false, excludedClasses);
 
-        resources.produce(new NativeImageResourceBuildItem(
-                "proto/generated/persistence.jdbc.proto"));
-
         // Ensure that optional store implementations not included in core-graalvm are still detected
         addReflectionForClass(StoreConfigurationBuilder.class, combinedIndex, reflectiveClass, excludedClasses);
         addReflectionForClass(StoreConfiguration.class, combinedIndex, reflectiveClass, true, excludedClasses);
diff --git a/extension/runtime/pom.xml b/extension/runtime/pom.xml
@@ -66,6 +66,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-query</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.infinispan.protostream</groupId>
             <artifactId>protostream-types</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -26,6 +26,7 @@
         <infinispan.version>15.0.19.Final</infinispan.version>
         <jgroups.raft.version>1.0.14.Final</jgroups.raft.version>
         <assertj.version>3.26.3</assertj.version>
+        <hibernate-search.version>7.1.2.Final</hibernate-search.version>
     </properties>
     <licenses>
         <license>
@@ -43,6 +44,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate.search</groupId>
+                <artifactId>hibernate-search-bom</artifactId>
+                <version>${hibernate-search.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bom</artifactId>
@@ -119,6 +127,7 @@
                 <module>samples/sample</module>
                 <module>samples/cache-sample</module>
                 <module>samples/persisted-cache-sample</module>
+                <module>samples/query-sample</module>
             </modules>
         </profile>
         <profile>
diff --git a/samples/cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/Weather.java b/samples/cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/Weather.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.infinispan.embedded.cache.sample;
+package io.quarkiverse.infinispan.embedded.persistence.sample;
 
 import org.infinispan.protostream.GeneratedSchema;
 import org.infinispan.protostream.annotations.Proto;
diff --git a/samples/cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/WeatherResource.java b/samples/cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/WeatherResource.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.infinispan.embedded.cache.sample;
+package io.quarkiverse.infinispan.embedded.persistence.sample;
 
 import jakarta.inject.Inject;
 import jakarta.ws.rs.DELETE;
diff --git a/samples/cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/WeatherService.java b/samples/cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/WeatherService.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.infinispan.embedded.cache.sample;
+package io.quarkiverse.infinispan.embedded.persistence.sample;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/samples/cache-sample/src/test/java/io/quarkiverse/infinispan/embedded/persistence/sample/WeatherResourceIT.java b/samples/cache-sample/src/test/java/io/quarkiverse/infinispan/embedded/persistence/sample/WeatherResourceIT.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.infinispan.embedded.cache.sample;
+package io.quarkiverse.infinispan.embedded.persistence.sample;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 
diff --git a/samples/cache-sample/src/test/java/io/quarkiverse/infinispan/embedded/persistence/sample/WeatherResourceTest.java b/samples/cache-sample/src/test/java/io/quarkiverse/infinispan/embedded/persistence/sample/WeatherResourceTest.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.infinispan.embedded.cache.sample;
+package io.quarkiverse.infinispan.embedded.persistence.sample;
 
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/samples/persisted-cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/TodoItem.java b/samples/persisted-cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/TodoItem.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.infinispan.embedded.cache.same;
+package io.quarkiverse.infinispan.embedded.persistence.sample;
 
 import org.infinispan.protostream.GeneratedSchema;
 import org.infinispan.protostream.annotations.Proto;
diff --git a/samples/persisted-cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/TodoListService.java b/samples/persisted-cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/TodoListService.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.infinispan.embedded.cache.same;
+package io.quarkiverse.infinispan.embedded.persistence.sample;
 
 import java.util.Comparator;
 import java.util.List;
diff --git a/samples/persisted-cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/TodoResource.java b/samples/persisted-cache-sample/src/main/java/io/quarkiverse/infinispan/embedded/persistence/sample/TodoResource.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.infinispan.embedded.cache.same;
+package io.quarkiverse.infinispan.embedded.persistence.sample;
 
 import java.util.List;
 
diff --git a/samples/persisted-cache-sample/src/test/java/io/quarkiverse/infinispan/embedded/persistence/sample/TodolistResourceIT.java b/samples/persisted-cache-sample/src/test/java/io/quarkiverse/infinispan/embedded/persistence/sample/TodolistResourceIT.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.infinispan.embedded.cache.sample;
+package io.quarkiverse.infinispan.embedded.persistence.sample;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 
diff --git a/samples/persisted-cache-sample/src/test/java/io/quarkiverse/infinispan/embedded/persistence/sample/TodolistResourceTest.java b/samples/persisted-cache-sample/src/test/java/io/quarkiverse/infinispan/embedded/persistence/sample/TodolistResourceTest.java
@@ -1,12 +1,11 @@
-package io.quarkiverse.infinispan.embedded.cache.sample;
+package io.quarkiverse.infinispan.embedded.persistence.sample;
 
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.Test;
 
-import io.quarkiverse.infinispan.embedded.cache.same.TodoItem;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
diff --git a/samples/query-sample/pom.xml b/samples/query-sample/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.quarkiverse.infinispan</groupId>
+        <artifactId>quarkus-infinispan-embedded-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-infinispan-query-sample</artifactId>
+    <name>Quarkus - Infinispan - Embedded Query :: Sample</name>
+
+    <properties>
+        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+        <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+        <quarkus.platform.version>${quarkus.version}</quarkus.platform.version>
+        <compiler-plugin.version>3.11.0</compiler-plugin.version>
+        <surefire-plugin.version>3.1.2</surefire-plugin.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.parameters>true</maven.compiler.parameters>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkiverse.infinispan</groupId>
+            <artifactId>quarkus-infinispan-embedded</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-jackson</artifactId>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkiverse.infinispan</groupId>
+            <artifactId>quarkus-infinispan-embedded-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${compiler-plugin.version}</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire-plugin.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <maven.home>${maven.home}</maven.home>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>${quarkus.platform.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.native.enabled>true</quarkus.native.enabled>
+                <quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${surefire-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                                        <maven.home>${maven.home}</maven.home>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/samples/query-sample/src/main/docker/Dockerfile.jvm b/samples/query-sample/src/main/docker/Dockerfile.jvm
diff --git a/samples/query-sample/src/main/docker/Dockerfile.legacy-jar b/samples/query-sample/src/main/docker/Dockerfile.legacy-jar
diff --git a/samples/query-sample/src/main/java/io/quarkiverse/infinispan/embedded/query/sample/Tariff.java b/samples/query-sample/src/main/java/io/quarkiverse/infinispan/embedded/query/sample/Tariff.java
diff --git a/samples/query-sample/src/main/java/io/quarkiverse/infinispan/embedded/query/sample/TariffResource.java b/samples/query-sample/src/main/java/io/quarkiverse/infinispan/embedded/query/sample/TariffResource.java
diff --git a/samples/query-sample/src/main/resources/application.properties b/samples/query-sample/src/main/resources/application.properties
diff --git a/samples/query-sample/src/main/resources/caches.xml b/samples/query-sample/src/main/resources/caches.xml
diff --git a/samples/query-sample/src/test/java/io/quarkiverse/infinispan/embedded/query/sample/TariffResourceTest.java b/samples/query-sample/src/test/java/io/quarkiverse/infinispan/embedded/query/sample/TariffResourceTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.quarkiverse.infinispan.embedded.cache.sample;`
	`1`	`+package io.quarkiverse.infinispan.embedded.persistence.sample;`
`2`	`2`
`3`	`3`	`import org.infinispan.protostream.GeneratedSchema;`
`4`	`4`	`import org.infinispan.protostream.annotations.Proto;`