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 2016/07/06 06:46:15 UTC
[1/2] camel git commit: Elasticsearch bulk_insert endpoint can now
accept a list of IndexRequest or UpdateRequest objects
Repository: camel
Updated Branches:
refs/heads/master 70fe8c29b -> 25410ef00
Elasticsearch bulk_insert endpoint can now accept a list of IndexRequest or UpdateRequest objects
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/896e2dcb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/896e2dcb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/896e2dcb
Branch: refs/heads/master
Commit: 896e2dcb7469622233b7360fff74209e85bbb105
Parents: 70fe8c2
Author: Bryan Love <br...@iovation.com>
Authored: Tue Jul 5 14:20:11 2016 -0700
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 6 08:42:11 2016 +0200
----------------------------------------------------------------------
.../converter/ElasticsearchActionRequestConverter.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/896e2dcb/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
index 78f7534..b822943 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
@@ -44,6 +44,9 @@ public final class ElasticsearchActionRequestConverter {
// Update requests
private static UpdateRequest createUpdateRequest(Object document, Exchange exchange) {
+ if (document instanceof UpdateRequest){
+ return (UpdateRequest)document;
+ }
UpdateRequest updateRequest = new UpdateRequest();
if (document instanceof byte[]) {
updateRequest.doc((byte[]) document);
@@ -74,6 +77,9 @@ public final class ElasticsearchActionRequestConverter {
// Index requests
private static IndexRequest createIndexRequest(Object document, Exchange exchange) {
+ if (document instanceof IndexRequest){
+ return (IndexRequest)document;
+ }
IndexRequest indexRequest = new IndexRequest();
if (document instanceof byte[]) {
indexRequest.source((byte[]) document);
[2/2] camel git commit: Fixed CS. This closes #1066. This closes
#1065.
Posted by da...@apache.org.
Fixed CS. This closes #1066. This closes #1065.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/25410ef0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/25410ef0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/25410ef0
Branch: refs/heads/master
Commit: 25410ef005ac9ade7b1469fbf8fba33a34b20ef0
Parents: 896e2dc
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 6 08:46:04 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 6 08:46:04 2016 +0200
----------------------------------------------------------------------
.../converter/ElasticsearchActionRequestConverter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/25410ef0/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
index b822943..7e53fc1 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
@@ -44,7 +44,7 @@ public final class ElasticsearchActionRequestConverter {
// Update requests
private static UpdateRequest createUpdateRequest(Object document, Exchange exchange) {
- if (document instanceof UpdateRequest){
+ if (document instanceof UpdateRequest) {
return (UpdateRequest)document;
}
UpdateRequest updateRequest = new UpdateRequest();
@@ -77,7 +77,7 @@ public final class ElasticsearchActionRequestConverter {
// Index requests
private static IndexRequest createIndexRequest(Object document, Exchange exchange) {
- if (document instanceof IndexRequest){
+ if (document instanceof IndexRequest) {
return (IndexRequest)document;
}
IndexRequest indexRequest = new IndexRequest();