You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2026/04/30 09:07:57 UTC
(camel-quarkus) branch main updated: Promote elasticsearch to native support
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 9742823cd3 Promote elasticsearch to native support
9742823cd3 is described below
commit 9742823cd35ea18d63cd0433ee28edd52eaed276
Author: JinyuChen97 <as...@gmail.com>
AuthorDate: Thu Apr 30 10:07:51 2026 +0100
Promote elasticsearch to native support
- Move elasticsearch extension from extensions-jvm to extensions
- Move integration tests from integration-tests-jvm to integration-tests
- using quarkus-elasticsearch-java-client to support camel-quarkus-elasticsearch native mode
- All tests pass in both JVM and native modes (9/9)
Fixes #4155
---
.../ROOT/examples/components/elasticsearch.yml | 6 +-
.../pages/reference/extensions/elasticsearch.adoc | 14 +-
extensions-jvm/pom.xml | 1 -
.../elasticsearch/deployment/pom.xml | 4 +
.../deployment/ElasticsearchProcessor.java | 16 ---
.../elasticsearch/pom.xml | 2 +-
.../elasticsearch/runtime/pom.xml | 5 +
.../main/resources/META-INF/quarkus-extension.yaml | 1 -
extensions/pom.xml | 1 +
integration-tests-jvm/pom.xml | 1 -
.../elasticsearch/pom.xml | 27 ++++
.../elasticsearch/it/ElasticsearchResource.java | 90 +++++++++++++
.../elasticsearch/it/ElasticsearchRoutes.java | 0
.../elasticsearch/it/ElasticsearchIT.java | 24 ++++
.../elasticsearch/it/ElasticsearchTest.java | 147 +++++++++++++++++++++
.../it/ElasticsearchTestResource.java | 7 +-
.../src/test/resources/application.properties | 18 +++
integration-tests/pom.xml | 1 +
tooling/scripts/test-categories.yaml | 1 +
19 files changed, 335 insertions(+), 31 deletions(-)
diff --git a/docs/modules/ROOT/examples/components/elasticsearch.yml b/docs/modules/ROOT/examples/components/elasticsearch.yml
index 5413f9fd95..bf34218ee4 100644
--- a/docs/modules/ROOT/examples/components/elasticsearch.yml
+++ b/docs/modules/ROOT/examples/components/elasticsearch.yml
@@ -2,11 +2,11 @@
# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
cqArtifactId: camel-quarkus-elasticsearch
cqArtifactIdBase: elasticsearch
-cqNativeSupported: false
-cqStatus: Preview
+cqNativeSupported: true
+cqStatus: Stable
cqDeprecated: false
cqJvmSince: 3.2.0
-cqNativeSince: n/a
+cqNativeSince: 3.36.0
cqCamelPartName: elasticsearch
cqCamelPartTitle: Elasticsearch
cqCamelPartDescription: Send requests to ElasticSearch via Java Client API.
diff --git a/docs/modules/ROOT/pages/reference/extensions/elasticsearch.adoc b/docs/modules/ROOT/pages/reference/extensions/elasticsearch.adoc
index 81905ec80f..78440a0470 100644
--- a/docs/modules/ROOT/pages/reference/extensions/elasticsearch.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/elasticsearch.adoc
@@ -4,17 +4,17 @@
= Elasticsearch
:linkattrs:
:cq-artifact-id: camel-quarkus-elasticsearch
-:cq-native-supported: false
-:cq-status: Preview
-:cq-status-deprecation: Preview
+:cq-native-supported: true
+:cq-status: Stable
+:cq-status-deprecation: Stable
:cq-description: Send requests to ElasticSearch via Java Client API.
:cq-deprecated: false
:cq-jvm-since: 3.2.0
-:cq-native-since: n/a
+:cq-native-since: 3.36.0
ifeval::[{doc-show-badges} == true]
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##3.2.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##3.2.0## [.badge-key]##Native since##[.badge-supported]##3.36.0##
endif::[]
Send requests to ElasticSearch via Java Client API.
@@ -29,6 +29,10 @@ Please refer to the above link for usage and configuration details.
[id="extensions-elasticsearch-maven-coordinates"]
== Maven coordinates
+https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-elasticsearch[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"]
+
+Or add the coordinates to your existing project:
+
[source,xml]
----
<dependency>
diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
index b2ab323959..a32d7b6144 100644
--- a/extensions-jvm/pom.xml
+++ b/extensions-jvm/pom.xml
@@ -57,7 +57,6 @@
<module>drill</module>
<module>dsl-modeline</module>
<module>ehcache</module>
- <module>elasticsearch</module>
<module>fastjson</module>
<module>flink</module>
<module>google-functions</module>
diff --git a/extensions-jvm/elasticsearch/deployment/pom.xml b/extensions/elasticsearch/deployment/pom.xml
similarity index 94%
rename from extensions-jvm/elasticsearch/deployment/pom.xml
rename to extensions/elasticsearch/deployment/pom.xml
index 04f3cfc0bd..a77af3e94e 100644
--- a/extensions-jvm/elasticsearch/deployment/pom.xml
+++ b/extensions/elasticsearch/deployment/pom.xml
@@ -42,6 +42,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-commons-logging-deployment</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-elasticsearch-java-client-deployment</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions-jvm/elasticsearch/deployment/src/main/java/org/apache/camel/quarkus/component/elasticsearch/deployment/ElasticsearchProcessor.java b/extensions/elasticsearch/deployment/src/main/java/org/apache/camel/quarkus/component/elasticsearch/deployment/ElasticsearchProcessor.java
similarity index 61%
rename from extensions-jvm/elasticsearch/deployment/src/main/java/org/apache/camel/quarkus/component/elasticsearch/deployment/ElasticsearchProcessor.java
rename to extensions/elasticsearch/deployment/src/main/java/org/apache/camel/quarkus/component/elasticsearch/deployment/ElasticsearchProcessor.java
index 34ba249278..ca62419393 100644
--- a/extensions-jvm/elasticsearch/deployment/src/main/java/org/apache/camel/quarkus/component/elasticsearch/deployment/ElasticsearchProcessor.java
+++ b/extensions/elasticsearch/deployment/src/main/java/org/apache/camel/quarkus/component/elasticsearch/deployment/ElasticsearchProcessor.java
@@ -17,30 +17,14 @@
package org.apache.camel.quarkus.component.elasticsearch.deployment;
import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
-import org.apache.camel.quarkus.core.JvmOnlyRecorder;
-import org.jboss.logging.Logger;
class ElasticsearchProcessor {
- private static final Logger LOG = Logger.getLogger(ElasticsearchProcessor.class);
private static final String FEATURE = "camel-elasticsearch";
@BuildStep
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
-
- /**
- * Remove this once this extension starts supporting the native mode.
- */
- @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
- @Record(value = ExecutionTime.RUNTIME_INIT)
- void warnJvmInNative(JvmOnlyRecorder recorder) {
- JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time
- recorder.warnJvmInNative(FEATURE); // warn at runtime
- }
}
diff --git a/extensions-jvm/elasticsearch/pom.xml b/extensions/elasticsearch/pom.xml
similarity index 96%
rename from extensions-jvm/elasticsearch/pom.xml
rename to extensions/elasticsearch/pom.xml
index d5c4f097c9..1375af5e72 100644
--- a/extensions-jvm/elasticsearch/pom.xml
+++ b/extensions/elasticsearch/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-extensions-jvm</artifactId>
+ <artifactId>camel-quarkus-extensions</artifactId>
<version>3.36.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/extensions-jvm/elasticsearch/runtime/pom.xml b/extensions/elasticsearch/runtime/pom.xml
similarity index 92%
rename from extensions-jvm/elasticsearch/runtime/pom.xml
rename to extensions/elasticsearch/runtime/pom.xml
index 5dde9c3b6b..57ea3f639b 100644
--- a/extensions-jvm/elasticsearch/runtime/pom.xml
+++ b/extensions/elasticsearch/runtime/pom.xml
@@ -32,6 +32,7 @@
<properties>
<camel.quarkus.jvmSince>3.2.0</camel.quarkus.jvmSince>
+ <camel.quarkus.nativeSince>3.36.0</camel.quarkus.nativeSince>
</properties>
<dependencies>
@@ -47,6 +48,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-elasticsearch-java-client</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions-jvm/elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 98%
rename from extensions-jvm/elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions/elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 6f32731611..6c76ba4c16 100644
--- a/extensions-jvm/elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -26,7 +26,6 @@ description: "Send requests to ElasticSearch via Java Client API"
metadata:
icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"
sponsor: "Apache Software Foundation"
- unlisted: true
guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/elasticsearch.html"
categories:
- "integration"
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 1cf2615dbb..323b72ff18 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -106,6 +106,7 @@
<module>disruptor</module>
<module>docling</module>
<module>dropbox</module>
+ <module>elasticsearch</module>
<module>elasticsearch-rest-client</module>
<module>exec</module>
<module>fhir</module>
diff --git a/integration-tests-jvm/pom.xml b/integration-tests-jvm/pom.xml
index 819c7eef4f..704d901713 100644
--- a/integration-tests-jvm/pom.xml
+++ b/integration-tests-jvm/pom.xml
@@ -56,7 +56,6 @@
<module>drill</module>
<module>dsl-modeline</module>
<module>ehcache</module>
- <module>elasticsearch</module>
<module>fastjson</module>
<module>flink</module>
<module>google-functions</module>
diff --git a/integration-tests-jvm/elasticsearch/pom.xml b/integration-tests/elasticsearch/pom.xml
similarity index 83%
rename from integration-tests-jvm/elasticsearch/pom.xml
rename to integration-tests/elasticsearch/pom.xml
index d67ffa3cb8..71d491ab41 100644
--- a/integration-tests-jvm/elasticsearch/pom.xml
+++ b/integration-tests/elasticsearch/pom.xml
@@ -116,5 +116,32 @@
<skipTests>true</skipTests>
</properties>
</profile>
+ <profile>
+ <id>native</id>
+ <activation>
+ <property>
+ <name>native</name>
+ </property>
+ </activation>
+ <properties>
+ <quarkus.native.enabled>true</quarkus.native.enabled>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/integration-tests-jvm/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchResource.java b/integration-tests/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchResource.java
similarity index 76%
rename from integration-tests-jvm/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchResource.java
rename to integration-tests/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchResource.java
index 4884d091d4..720d0a1b2b 100644
--- a/integration-tests-jvm/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchResource.java
+++ b/integration-tests/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchResource.java
@@ -18,14 +18,20 @@ package org.apache.camel.quarkus.component.elasticsearch.it;
import java.net.URI;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import co.elastic.clients.elasticsearch.core.BulkRequest;
import co.elastic.clients.elasticsearch.core.GetResponse;
+import co.elastic.clients.elasticsearch.core.MgetRequest;
import co.elastic.clients.elasticsearch.core.MsearchRequest;
+import co.elastic.clients.elasticsearch.core.SearchRequest;
+import co.elastic.clients.elasticsearch.core.UpdateRequest;
import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
import co.elastic.clients.elasticsearch.core.bulk.BulkResponseItem;
import co.elastic.clients.elasticsearch.core.bulk.IndexOperation;
+import co.elastic.clients.elasticsearch.core.mget.MultiGetOperation;
+import co.elastic.clients.elasticsearch.core.mget.MultiGetResponseItem;
import co.elastic.clients.elasticsearch.core.msearch.MultiSearchResponseItem;
import co.elastic.clients.elasticsearch.core.msearch.MultisearchHeader;
import co.elastic.clients.elasticsearch.core.msearch.RequestItem;
@@ -34,6 +40,7 @@ import co.elastic.clients.elasticsearch.indices.DeleteIndexRequest;
import com.fasterxml.jackson.databind.node.ObjectNode;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.PATCH;
@@ -118,6 +125,29 @@ public class ElasticsearchResource {
return Response.ok().build();
}
+ @Path("/update/builder")
+ @PATCH
+ @Produces(MediaType.TEXT_PLAIN)
+ public Response updateDataBuilder(
+ @QueryParam("component") String component,
+ @QueryParam("indexName") String indexName,
+ @QueryParam("indexId") String indexId,
+ @QueryParam("indexKey") String indexKey,
+ String indexValue) {
+
+ UpdateRequest.Builder<Map<String, String>, Map<String, String>> request = new UpdateRequest.Builder<>();
+ request.index(indexName)
+ .id(indexId)
+ .doc(createIndexedData(indexKey, indexValue));
+
+ fluentProducerTemplate.to("direct:update")
+ .withBody(request)
+ .withHeader(HEADER_COMPONENT, component)
+ .request();
+
+ return Response.ok().build();
+ }
+
@Path("/delete")
@DELETE
@Produces(MediaType.TEXT_PLAIN)
@@ -254,6 +284,32 @@ public class ElasticsearchResource {
return Response.ok().build();
}
+ @Path("/search/builder")
+ @GET
+ @Produces(MediaType.TEXT_PLAIN)
+ public Response searchByBuilder(
+ @QueryParam("component") String component,
+ @QueryParam("indexKey") String indexKey,
+ String searchString) {
+
+ SearchRequest.Builder request = new SearchRequest.Builder();
+ request.query(q -> q.match(m -> m.field(indexKey).query(searchString)));
+
+ HitsMetadata<?> result = fluentProducerTemplate.to("direct:search")
+ .withBody(request)
+ .withHeader(HEADER_COMPONENT, component)
+ .request(HitsMetadata.class);
+
+ if (result.hits().size() > 0) {
+ Object source = result.hits().get(0).source();
+ if (source instanceof ObjectNode) {
+ return Response.ok(((ObjectNode) source).get(indexKey).asText()).build();
+ }
+ }
+ // return OK as it is called in loop
+ return Response.ok().build();
+ }
+
@Path("/search/multi")
@GET
@Produces(MediaType.TEXT_PLAIN)
@@ -286,6 +342,40 @@ public class ElasticsearchResource {
return Response.ok().build();
}
+ @Path("/multiget")
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.TEXT_PLAIN)
+ public Response multiGet(
+ @QueryParam("component") String component,
+ @QueryParam("indexName") String indexName,
+ String jsonBody) {
+
+ // Parse JSON array manually
+ List<String> indexIds = null;
+ try {
+ indexIds = new com.fasterxml.jackson.databind.ObjectMapper()
+ .readValue(jsonBody, new com.fasterxml.jackson.core.type.TypeReference<List<String>>() {
+ });
+ } catch (Exception e) {
+ return Response.status(400).entity("Invalid JSON body").build();
+ }
+
+ MgetRequest.Builder request = new MgetRequest.Builder()
+ .index(indexName);
+
+ for (String id : indexIds) {
+ request.docs(new MultiGetOperation.Builder().id(id).build());
+ }
+
+ MultiGetResponseItem[] result = fluentProducerTemplate.to("direct:multiGet")
+ .withBody(request)
+ .withHeader(HEADER_COMPONENT, component)
+ .request(MultiGetResponseItem[].class);
+
+ return Response.ok(result.length).build();
+ }
+
private Map<String, String> createIndexedData(String indexKey, String indexValue) {
Map<String, String> map = new HashMap<>();
map.put(indexKey, indexValue);
diff --git a/integration-tests-jvm/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchRoutes.java b/integration-tests/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchRoutes.java
similarity index 100%
rename from integration-tests-jvm/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchRoutes.java
rename to integration-tests/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchRoutes.java
diff --git a/integration-tests/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchIT.java b/integration-tests/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchIT.java
new file mode 100644
index 0000000000..324f960d30
--- /dev/null
+++ b/integration-tests/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchIT.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.elasticsearch.it;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+class ElasticsearchIT extends ElasticsearchTest {
+
+}
diff --git a/integration-tests-jvm/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTest.java b/integration-tests/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTest.java
similarity index 76%
rename from integration-tests-jvm/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTest.java
rename to integration-tests/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTest.java
index 9d3f4c23eb..ff9bb766c3 100644
--- a/integration-tests-jvm/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTest.java
+++ b/integration-tests/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTest.java
@@ -22,6 +22,7 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
+import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -370,6 +371,51 @@ class ElasticsearchTest {
});
}
+ @ParameterizedTest
+ @MethodSource("componentNames")
+ public void testElasticsearchMultiGet(String component) {
+ String indexName = UUID.randomUUID().toString();
+ String indexKey = "test-key";
+
+ // Index multiple documents
+ String indexId1 = RestAssured.given()
+ .queryParam("component", component)
+ .queryParam("indexName", indexName)
+ .queryParam("indexKey", indexKey)
+ .contentType(ContentType.TEXT)
+ .body("Document 1")
+ .post("/elasticsearch/index")
+ .then()
+ .statusCode(201)
+ .extract()
+ .body()
+ .asString();
+
+ String indexId2 = RestAssured.given()
+ .queryParam("component", component)
+ .queryParam("indexName", indexName)
+ .queryParam("indexKey", indexKey)
+ .contentType(ContentType.TEXT)
+ .body("Document 2")
+ .post("/elasticsearch/index")
+ .then()
+ .statusCode(201)
+ .extract()
+ .body()
+ .asString();
+
+ // MultiGet both documents using JSON array
+ RestAssured.given()
+ .queryParam("component", component)
+ .queryParam("indexName", indexName)
+ .contentType(ContentType.JSON)
+ .body(List.of(indexId1, indexId2))
+ .post("/elasticsearch/multiget")
+ .then()
+ .statusCode(200)
+ .body(is("2"));
+ }
+
/**
* Queries the Elasticsearch cluster health status and waits until it's green or yellow.
* Retries with Awaitility until the cluster is ready.
@@ -433,6 +479,107 @@ class ElasticsearchTest {
}, Objects::nonNull);
}
+ @ParameterizedTest
+ @MethodSource("componentNames")
+ public void testElasticsearchSearchWithBuilder(String component) {
+ String indexName = UUID.randomUUID().toString();
+ String indexKey = "camel-quarkus";
+ String indexValue = "Sub Atomic, Super Fast Camel Quarkus";
+
+ // Index data
+ RestAssured.given()
+ .queryParam("component", component)
+ .queryParam("indexName", indexName)
+ .queryParam("indexKey", indexKey)
+ .contentType(ContentType.TEXT)
+ .body(indexValue)
+ .post("/elasticsearch/index")
+ .then()
+ .statusCode(201)
+ .extract()
+ .body()
+ .asString();
+
+ // Verify index exists
+ RestAssured.given()
+ .queryParam("component", component)
+ .queryParam("indexName", indexName)
+ .get("/elasticsearch/exists")
+ .then()
+ .statusCode(200)
+ .body(is("true"));
+
+ // Search data using Builder API
+ Awaitility.await().pollInterval(50, TimeUnit.MILLISECONDS).atMost(10, TimeUnit.SECONDS).until(() -> {
+ String searchResult = RestAssured.given()
+ .queryParam("component", component)
+ .queryParam("indexKey", indexKey)
+ .body("Super Fast")
+ .get("/elasticsearch/search/builder")
+ .then()
+ .statusCode(200)
+ .extract()
+ .body()
+ .asString();
+ return searchResult.equals(indexValue);
+ });
+ }
+
+ @ParameterizedTest
+ @MethodSource("componentNames")
+ public void testElasticsearchUpdateWithBuilder(String component) {
+ String indexName = UUID.randomUUID().toString();
+ String indexKey = "test-key";
+ String indexValue = "Hello Camel Quarkus ElasticSearch";
+
+ // Index data
+ String indexId = RestAssured.given()
+ .queryParam("component", component)
+ .queryParam("indexName", indexName)
+ .queryParam("indexKey", indexKey)
+ .contentType(ContentType.TEXT)
+ .body(indexValue)
+ .post("/elasticsearch/index")
+ .then()
+ .statusCode(201)
+ .extract()
+ .body()
+ .asString();
+
+ // Verify index exists
+ RestAssured.given()
+ .queryParam("component", component)
+ .queryParam("indexName", indexName)
+ .get("/elasticsearch/exists")
+ .then()
+ .statusCode(200)
+ .body(is("true"));
+
+ // Update indexed data using Builder API
+ String updatedIndexValue = indexValue + " Updated";
+ RestAssured.given()
+ .contentType(ContentType.TEXT)
+ .queryParam("component", component)
+ .queryParam("indexId", indexId)
+ .queryParam("indexName", indexName)
+ .queryParam("indexKey", indexKey)
+ .body(updatedIndexValue)
+ .patch("/elasticsearch/update/builder")
+ .then()
+ .statusCode(200);
+
+ // Verify updated data
+ RestAssured.given()
+ .queryParam("component", component)
+ .queryParam("indexName", indexName)
+ .queryParam("indexId", indexId)
+ .queryParam("indexKey", indexKey)
+ .get("/elasticsearch/get")
+ .then()
+ .statusCode(200)
+ .body(is(updatedIndexValue));
+ }
+
/**
* This method returns array of component names used in test routes.
* It can be handy e.g. for testing quarkus managed elasticsearch client.
diff --git a/integration-tests-jvm/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTestResource.java b/integration-tests/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTestResource.java
similarity index 93%
rename from integration-tests-jvm/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTestResource.java
rename to integration-tests/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTestResource.java
index 997478f59b..867e95a9b6 100644
--- a/integration-tests-jvm/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTestResource.java
+++ b/integration-tests/elasticsearch/src/test/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchTestResource.java
@@ -57,12 +57,13 @@ public class ElasticsearchTestResource implements QuarkusTestResourceLifecycleMa
String hostAddresses = String.format("%s:%d", container.getHost(), container.getMappedPort(ELASTICSEARCH_PORT));
- // Component configuration where the ElasticSearch client is managed by Camel (E.g autowiring disabled)
return CollectionHelper.mapOf(
- // camel
+ // Camel Elasticsearch component configuration
"camel.component.elasticsearch.host-addresses", hostAddresses,
"camel.component.elasticsearch.user", ELASTICSEARCH_USERNAME,
- "camel.component.elasticsearch.password", ELASTICSEARCH_PASSWORD);
+ "camel.component.elasticsearch.password", ELASTICSEARCH_PASSWORD,
+ // Disable autowiring to use camel component functionality
+ "camel.component.elasticsearch.autowired-enabled", "false");
} catch (Exception e) {
throw new RuntimeException(e);
diff --git a/integration-tests/elasticsearch/src/test/resources/application.properties b/integration-tests/elasticsearch/src/test/resources/application.properties
new file mode 100644
index 0000000000..660b157aa4
--- /dev/null
+++ b/integration-tests/elasticsearch/src/test/resources/application.properties
@@ -0,0 +1,18 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+## Disable DevServices explicitly
+quarkus.elasticsearch.devservices.enabled=false
\ No newline at end of file
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 2385c5fab6..d5d4ec459c 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -85,6 +85,7 @@
<module>disruptor</module>
<module>docling</module>
<module>dropbox</module>
+ <module>elasticsearch</module>
<module>elasticsearch-rest-client</module>
<module>exec</module>
<module>fhir</module>
diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
index 5ebd04d278..c228da4da2 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -58,6 +58,7 @@ group-02:
group-03:
- bean-validator
- box
+ - elasticsearch
- elasticsearch-rest-client
- foundation-grouped
- freemarker