You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/11/07 12:17:11 UTC
[camel] branch master updated (6c851d8 -> 152a650)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 6c851d8 CAMEL-12916: camel-http4 - The sslContextParameters option should be documented on endpoint as well.
new 6b9fa87 CAMEL-12749 - Added Multisearch Operation to camel-elasticsearch-rest
new a2e1fc3 CAMEL-12749 - Fixed CS
new 9fe7baa CAMEL-12749 - Added docs and removed the converter since it doesn't make sense to have one
new 3964707 CAMEL-12749 - Fixed docs
new 152a650 Fixed minor stuff in docs
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/docs/elasticsearch-rest-component.adoc | 37 +++++++++++++++++++++-
.../elasticsearch/ElasticsearchOperation.java | 1 +
.../elasticsearch/ElasticsearchProducer.java | 6 ++++
.../ElasticsearchActionRequestConverter.java | 3 +-
...asticsearchGetSearchDeleteExistsUpdateTest.java | 27 ++++++++++++++++
5 files changed, 72 insertions(+), 2 deletions(-)
[camel] 04/05: CAMEL-12749 - Fixed docs
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3964707735a529c3e2bc59769d501c10a53eb46f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 7 13:16:12 2018 +0100
CAMEL-12749 - Fixed docs
---
.../src/main/docs/elasticsearch-rest-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
index 0d3fbb4..2d07340 100644
--- a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
+++ b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
@@ -279,7 +279,7 @@ from("direct:multiSearch")
</route>
----
-MultiSearch on specific field(s) using Map.
+MultiSearch on specific field(s)
[source,java]
----
[camel] 05/05: Fixed minor stuff in docs
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 152a6500e3110e01ef93a3bb4f80ce92dd2310c5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 7 13:16:39 2018 +0100
Fixed minor stuff in docs
---
.../src/main/docs/elasticsearch-rest-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
index 2d07340..1a8b6e2 100644
--- a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
+++ b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
@@ -233,7 +233,7 @@ from("direct:search")
----
<route>
<from uri="direct:search" />
- <to uri="eelasticsearch-rest://elasticsearch?operation=Search&indexName=twitter&indexType=tweet"/>
+ <to uri="elasticsearch-rest://elasticsearch?operation=Search&indexName=twitter&indexType=tweet"/>
</route>
----
[camel] 02/05: CAMEL-12749 - Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a2e1fc3b654e8ae6187e07077111d9d552ade524
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 7 13:07:55 2018 +0100
CAMEL-12749 - Fixed CS
---
.../apache/camel/component/elasticsearch/ElasticsearchProducer.java | 4 ++--
.../elasticsearch/converter/ElasticsearchActionRequestConverter.java | 2 +-
.../elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java | 3 ---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index e82e6ae..06072e5 100644
--- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -96,9 +96,9 @@ public class ElasticsearchProducer extends DefaultProducer {
return ElasticsearchOperation.Delete;
} else if (request instanceof SearchRequest) {
return ElasticsearchOperation.Search;
- } else if (request instanceof MultiSearchRequest) {
+ } else if (request instanceof MultiSearchRequest) {
return ElasticsearchOperation.MultiSearch;
- }else if (request instanceof DeleteIndexRequest) {
+ } else if (request instanceof DeleteIndexRequest) {
return ElasticsearchOperation.DeleteIndex;
}
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 df83860..9aab1b2 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
@@ -61,7 +61,7 @@ public final class ElasticsearchActionRequestConverter {
} else if (document instanceof Map) {
updateRequest.doc((Map<String, Object>) document);
} else if (document instanceof String) {
- updateRequest.doc(XContentFactory.xContent((String) document),(String) document);
+ updateRequest.doc(XContentFactory.xContent((String) document), (String) document);
} else if (document instanceof XContentBuilder) {
updateRequest.doc((XContentBuilder) document);
} else {
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
index 17e12d6..b8bf949 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
@@ -32,9 +32,6 @@ import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.search.SearchHits;
import org.junit.Test;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
[camel] 01/05: CAMEL-12749 - Added Multisearch Operation to
camel-elasticsearch-rest
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6b9fa87f1b2a301af0b59c16bc9d1e0173bfcc81
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 7 13:01:14 2018 +0100
CAMEL-12749 - Added Multisearch Operation to camel-elasticsearch-rest
---
.../elasticsearch/ElasticsearchOperation.java | 1 +
.../elasticsearch/ElasticsearchProducer.java | 8 +++++-
.../ElasticsearchActionRequestConverter.java | 10 ++++++++
...asticsearchGetSearchDeleteExistsUpdateTest.java | 30 ++++++++++++++++++++++
4 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchOperation.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchOperation.java
index c7e538f..8af7547 100644
--- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchOperation.java
+++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchOperation.java
@@ -37,6 +37,7 @@ public enum ElasticsearchOperation {
BulkIndex("BulkIndex"),
GetById("GetById"),
MultiGet("MultiGet"),
+ MultiSearch("MultiSearch"),
Delete("Delete"),
DeleteIndex("DeleteIndex"),
Search("Search"),
diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index ac436da..e82e6ae 100644
--- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -35,6 +35,7 @@ import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.MultiGetRequest;
import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.search.MultiSearchRequest;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.client.RestClient;
@@ -95,7 +96,9 @@ public class ElasticsearchProducer extends DefaultProducer {
return ElasticsearchOperation.Delete;
} else if (request instanceof SearchRequest) {
return ElasticsearchOperation.Search;
- } else if (request instanceof DeleteIndexRequest) {
+ } else if (request instanceof MultiSearchRequest) {
+ return ElasticsearchOperation.MultiSearch;
+ }else if (request instanceof DeleteIndexRequest) {
return ElasticsearchOperation.DeleteIndex;
}
@@ -192,6 +195,9 @@ public class ElasticsearchProducer extends DefaultProducer {
} else if (operation == ElasticsearchOperation.Search) {
SearchRequest searchRequest = message.getBody(SearchRequest.class);
message.setBody(restHighLevelClient.search(searchRequest).getHits());
+ } else if (operation == ElasticsearchOperation.MultiSearch) {
+ MultiSearchRequest searchRequest = message.getBody(MultiSearchRequest.class);
+ message.setBody(restHighLevelClient.multiSearch(searchRequest).getResponses());
} else if (operation == ElasticsearchOperation.Ping) {
message.setBody(restHighLevelClient.ping());
} else if (operation == ElasticsearchOperation.Info) {
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 8764ac5..df83860 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
@@ -28,6 +28,7 @@ import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.search.MultiSearchRequest;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.common.Strings;
@@ -193,6 +194,15 @@ public final class ElasticsearchActionRequestConverter {
return searchRequest;
}
+
+ @Converter
+ public static MultiSearchRequest toMultiSearchRequest(Object queryObject, Exchange exchange) throws IOException {
+ if (queryObject instanceof MultiSearchRequest) {
+ return (MultiSearchRequest) queryObject;
+ } else {
+ throw new IllegalArgumentException("Wrong body type. Only MultiSearchRequest is allowed as a type");
+ }
+ }
@Converter
public static BulkRequest toBulkRequest(Object documents, Exchange exchange) {
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
index be4d98b..17e12d6 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
@@ -26,10 +26,15 @@ import org.elasticsearch.action.delete.DeleteResponse;
import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.search.MultiSearchRequest;
+import org.elasticsearch.action.search.MultiSearchResponse.Item;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.search.SearchHits;
import org.junit.Test;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
@@ -115,6 +120,30 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
}
@Test
+ public void testMultiSearch() throws Exception {
+ //first, Index a value
+ Map<String, String> map = createIndexedData();
+ String indexId = template.requestBody("direct:index", map, String.class);
+ assertNotNull("indexId should be set", indexId);
+
+ //now, verify GET succeeded
+ GetResponse getResponse = template.requestBody("direct:get", indexId, GetResponse.class);
+ assertNotNull("response should not be null", getResponse);
+ assertNotNull("response source should not be null", getResponse.getSource());
+ //now, verify GET succeeded
+ SearchRequest req = new SearchRequest();
+ req.indices("twitter");
+ req.types("tweet");
+ SearchRequest req1 = new SearchRequest();
+ req.indices("twitter");
+ req.types("tweets");
+ MultiSearchRequest request = new MultiSearchRequest().add(req1).add(req);
+ Item[] response = template.requestBody("direct:search", request, Item[].class);
+ assertNotNull("response should not be null", response);
+ assertEquals("response should be == 2", 2, response.length);
+ }
+
+ @Test
public void testUpdate() throws Exception {
Map<String, String> map = createIndexedData();
String indexId = template.requestBody("direct:index", map, String.class);
@@ -296,6 +325,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
from("direct:multiget").to("elasticsearch-rest://elasticsearch?operation=MultiGet&indexName=twitter&indexType=tweet&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
from("direct:delete").to("elasticsearch-rest://elasticsearch?operation=Delete&indexName=twitter&indexType=tweet&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
from("direct:search").to("elasticsearch-rest://elasticsearch?operation=Search&indexName=twitter&indexType=tweet&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
+ from("direct:multiSearch").to("elasticsearch-rest://elasticsearch?operation=MultiSearch&indexName=twitter&indexType=tweet&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
from("direct:update").to("elasticsearch-rest://elasticsearch?operation=Update&indexName=twitter&indexType=tweet&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
from("direct:exists").to("elasticsearch-rest://elasticsearch?operation=Exists&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
}
[camel] 03/05: CAMEL-12749 - Added docs and removed the converter
since it doesn't make sense to have one
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9fe7baac9919abb27d3a227d4fc7973dcab77d7a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 7 13:15:34 2018 +0100
CAMEL-12749 - Added docs and removed the converter since it doesn't make sense to have one
---
.../main/docs/elasticsearch-rest-component.adoc | 35 ++++++++++++++++++++++
.../ElasticsearchActionRequestConverter.java | 9 ------
...asticsearchGetSearchDeleteExistsUpdateTest.java | 2 +-
3 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
index caf07dc..0d3fbb4 100644
--- a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
+++ b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
@@ -154,6 +154,8 @@ object in the body
|Search |*Map*, *String* or *SearchRequest* |Search the content with the map of query string
+|MultiSearch |*MultiSearchRequest* |Multiple search in one
+
|Exists |Index name(indexName) as header |Checks the index exists or not and returns a Boolean flag in the body
|Update |*Map*, *UpdateRequest*, *String*, *byte[]* or *XContentBuilder* content to update |Updates content to an index and returns the content's
@@ -257,3 +259,36 @@ query.put("query", match);
SearchHits response = template.requestBody("direct:search", query, SearchHits.class);
----
+
+=== MultiSearch Example
+
+MultiSearching on specific field(s) and value use the Operation ´MultiSearch´.
+Pass in the MultiSearchRequest instance
+
+[source,java]
+----
+from("direct:multiSearch")
+ .to("elasticsearch-rest://elasticsearch?operation=MultiSearch");
+----
+
+[source,xml]
+----
+<route>
+ <from uri="direct:multiSearch" />
+ <to uri="elasticsearch-rest://elasticsearch?operation=MultiSearch"/>
+</route>
+----
+
+MultiSearch on specific field(s) using Map.
+
+[source,java]
+----
+SearchRequest req = new SearchRequest();
+req.indices("twitter");
+req.types("tweet");
+SearchRequest req1 = new SearchRequest();
+req.indices("twitter");
+req.types("tweets");
+MultiSearchRequest request = new MultiSearchRequest().add(req1).add(req);
+Item[] response = template.requestBody("direct:search", request, Item[].class);
+----
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 9aab1b2..1347219 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
@@ -194,15 +194,6 @@ public final class ElasticsearchActionRequestConverter {
return searchRequest;
}
-
- @Converter
- public static MultiSearchRequest toMultiSearchRequest(Object queryObject, Exchange exchange) throws IOException {
- if (queryObject instanceof MultiSearchRequest) {
- return (MultiSearchRequest) queryObject;
- } else {
- throw new IllegalArgumentException("Wrong body type. Only MultiSearchRequest is allowed as a type");
- }
- }
@Converter
public static BulkRequest toBulkRequest(Object documents, Exchange exchange) {
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
index b8bf949..96e994f 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
@@ -322,7 +322,7 @@ public class ElasticsearchGetSearchDeleteExistsUpdateTest extends ElasticsearchB
from("direct:multiget").to("elasticsearch-rest://elasticsearch?operation=MultiGet&indexName=twitter&indexType=tweet&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
from("direct:delete").to("elasticsearch-rest://elasticsearch?operation=Delete&indexName=twitter&indexType=tweet&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
from("direct:search").to("elasticsearch-rest://elasticsearch?operation=Search&indexName=twitter&indexType=tweet&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
- from("direct:multiSearch").to("elasticsearch-rest://elasticsearch?operation=MultiSearch&indexName=twitter&indexType=tweet&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
+ from("direct:multiSearch").to("elasticsearch-rest://elasticsearch?operation=MultiSearch&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
from("direct:update").to("elasticsearch-rest://elasticsearch?operation=Update&indexName=twitter&indexType=tweet&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
from("direct:exists").to("elasticsearch-rest://elasticsearch?operation=Exists&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
}