You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2015/10/30 21:10:06 UTC
[1/3] camel git commit: add parent to constants
Repository: camel
Updated Branches:
refs/heads/master 4f239bc79 -> 8d31380c3
add parent to constants
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/021a93b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/021a93b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/021a93b2
Branch: refs/heads/master
Commit: 021a93b27371236b1fc3cefff02164c40c655455
Parents: 4f239bc
Author: Jay Lapham <ja...@gmail.com>
Authored: Fri Oct 30 11:59:48 2015 -0500
Committer: Jay Lapham <ja...@gmail.com>
Committed: Fri Oct 30 11:59:48 2015 -0500
----------------------------------------------------------------------
.../camel/component/elasticsearch/ElasticsearchConstants.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/021a93b2/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java
index 998047a..66388be 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConstants.java
@@ -35,6 +35,7 @@ public interface ElasticsearchConstants {
String PARAM_INDEX_TYPE = "indexType";
String PARAM_CONSISTENCY_LEVEL = "consistencyLevel";
String PARAM_REPLICATION_TYPE = "replicationType";
+ String PARENT = "parent";
String TRANSPORT_ADDRESSES = "transportAddresses";
String PROTOCOL = "elasticsearch";
String LOCAL_NAME = "local";
[2/3] camel git commit: add parent to elasticsearch IndexRequest
Posted by gz...@apache.org.
add parent to elasticsearch IndexRequest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/047d8e0f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/047d8e0f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/047d8e0f
Branch: refs/heads/master
Commit: 047d8e0f5658e038e3e14af13c92e8fa2b75dc16
Parents: 021a93b
Author: Jay Lapham <ja...@gmail.com>
Authored: Fri Oct 30 12:02:23 2015 -0500
Committer: Jay Lapham <ja...@gmail.com>
Committed: Fri Oct 30 12:02:23 2015 -0500
----------------------------------------------------------------------
.../converter/ElasticsearchActionRequestConverter.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/047d8e0f/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 3a804f5..af7b214 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
@@ -51,6 +51,8 @@ public final class ElasticsearchActionRequestConverter {
} else {
return null;
}
+
+ indexRequest.parent(exchange.getIn().getHeader(ElasticsearchConstants.PARENT, String.class));
return indexRequest
.consistencyLevel(exchange.getIn().getHeader(
[3/3] camel git commit: style consistency
Posted by gz...@apache.org.
style consistency
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d31380c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d31380c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d31380c
Branch: refs/heads/master
Commit: 8d31380c3bf6b80cb1fb0736721a364ccdf81699
Parents: 047d8e0
Author: Jay Lapham <ja...@gmail.com>
Authored: Fri Oct 30 12:07:36 2015 -0500
Committer: Jay Lapham <ja...@gmail.com>
Committed: Fri Oct 30 12:07:36 2015 -0500
----------------------------------------------------------------------
.../converter/ElasticsearchActionRequestConverter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8d31380c/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 af7b214..3763ff1 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
@@ -51,14 +51,14 @@ public final class ElasticsearchActionRequestConverter {
} else {
return null;
}
-
- indexRequest.parent(exchange.getIn().getHeader(ElasticsearchConstants.PARENT, String.class));
return indexRequest
.consistencyLevel(exchange.getIn().getHeader(
ElasticsearchConstants.PARAM_CONSISTENCY_LEVEL, WriteConsistencyLevel.class))
.replicationType(exchange.getIn().getHeader(
ElasticsearchConstants.PARAM_REPLICATION_TYPE, ReplicationType.class))
+ .parent(exchange.getIn().getHeader(
+ ElasticsearchConstants.PARENT, String.class))
.index(exchange.getIn().getHeader(
ElasticsearchConstants.PARAM_INDEX_NAME, String.class))
.type(exchange.getIn().getHeader(