You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/07/05 04:43:42 UTC
[camel] branch main updated: Elasticsearch-rest empty index name
problem (#5790)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 9121ca6 Elasticsearch-rest empty index name problem (#5790)
9121ca6 is described below
commit 9121ca6047c24338ec5635b9c59b9df9248422f1
Author: erayerdem <42...@users.noreply.github.com>
AuthorDate: Mon Jul 5 07:42:46 2021 +0300
Elasticsearch-rest empty index name problem (#5790)
* Elasticsearch-rest empty index name problem
* Update ElasticsearchActionRequestConverter.java
---
.../converter/ElasticsearchActionRequestConverter.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
index 56bf6c0..0e62d79 100644
--- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
+++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
@@ -162,14 +162,21 @@ public final class ElasticsearchActionRequestConverter {
@Converter
public static SearchRequest toSearchRequest(Object queryObject, Exchange exchange) throws IOException {
+ String indexName = exchange.getIn().getHeader(ElasticsearchConstants.PARAM_INDEX_NAME, String.class);
+
if (queryObject instanceof SearchRequest) {
- return (SearchRequest) queryObject;
+ SearchRequest searchRequest = (SearchRequest) queryObject;
+ String[] indices = searchRequest.indices();
+ if (indices == null || indices.length == 0) {
+ searchRequest.indices(indexName);
+ }
+ return searchRequest;
}
SearchRequest searchRequest = new SearchRequest();
// Only setup the indexName and indexType if the message header has the
// setting
- String indexName = exchange.getIn().getHeader(ElasticsearchConstants.PARAM_INDEX_NAME, String.class);
+
Integer size = exchange.getIn().getHeader(ElasticsearchConstants.PARAM_SIZE, Integer.class);
Integer from = exchange.getIn().getHeader(ElasticsearchConstants.PARAM_FROM, Integer.class);
if (ObjectHelper.isNotEmpty(indexName)) {