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/12/30 08:44:58 UTC
[1/2] camel git commit: Add Delete Index operation
Repository: camel
Updated Branches:
refs/heads/master 870b756e2 -> a9fe0d69e
Add Delete Index operation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/52e7be83
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/52e7be83
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/52e7be83
Branch: refs/heads/master
Commit: 52e7be834ba76cd7b46cf0e828c9bad1b69f84bd
Parents: 870b756
Author: coto <co...@coto-OptiPlex-3020>
Authored: Thu Dec 29 15:29:39 2016 -0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 30 09:41:23 2016 +0100
----------------------------------------------------------------------
.../component/elasticsearch/ElasticsearchConfiguration.java | 2 +-
.../component/elasticsearch/ElasticsearchConstants.java | 1 +
.../component/elasticsearch/ElasticsearchProducer.java | 6 ++++++
.../converter/ElasticsearchActionRequestConverter.java | 9 +++++++++
4 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/52e7be83/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
index 891baa3..13fb78f 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
@@ -34,7 +34,7 @@ public class ElasticsearchConfiguration {
@UriPath @Metadata(required = "true")
private String clusterName;
- @UriParam(enums = "INDEX,UPDATE,BULK,BULK_INDEX,GET_BY_ID,MULTIGET,DELETE,EXISTS,SEARCH,MULTISEARCH")
+ @UriParam(enums = "INDEX,UPDATE,BULK,BULK_INDEX,GET_BY_ID,MULTIGET,DELETE,EXISTS,SEARCH,MULTISEARCH,DELETE_INDEX")
private String operation;
@UriParam
private String indexName;
http://git-wip-us.apache.org/repos/asf/camel/blob/52e7be83/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 e4f2f39..f9d4b83 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
@@ -29,6 +29,7 @@ public interface ElasticsearchConstants {
String OPERATION_GET_BY_ID = "GET_BY_ID";
String OPERATION_MULTIGET = "MULTIGET";
String OPERATION_DELETE = "DELETE";
+ String OPERATION_DELETE_INDEX = "DELETE_INDEX";
String OPERATION_SEARCH = "SEARCH";
String OPERATION_MULTISEARCH = "MULTISEARCH";
String OPERATION_EXISTS = "EXISTS";
http://git-wip-us.apache.org/repos/asf/camel/blob/52e7be83/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index fede7ee..75164d2 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultProducer;
+import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
import org.elasticsearch.action.bulk.BulkItemResponse;
import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.delete.DeleteRequest;
@@ -82,6 +83,8 @@ public class ElasticsearchProducer extends DefaultProducer {
return ElasticsearchConstants.OPERATION_SEARCH;
} else if (request instanceof MultiSearchRequest) {
return ElasticsearchConstants.OPERATION_MULTISEARCH;
+ } else if (request instanceof DeleteIndexRequest) {
+ return ElasticsearchConstants.OPERATION_DELETE_INDEX;
}
String operationConfig = exchange.getIn().getHeader(ElasticsearchConstants.PARAM_OPERATION, String.class);
@@ -166,6 +169,9 @@ public class ElasticsearchProducer extends DefaultProducer {
} else if (ElasticsearchConstants.OPERATION_MULTISEARCH.equals(operation)) {
MultiSearchRequest multiSearchRequest = message.getBody(MultiSearchRequest.class);
message.setBody(client.multiSearch(multiSearchRequest));
+ } else if (ElasticsearchConstants.OPERATION_DELETE_INDEX.equals(operation)) {
+ DeleteIndexRequest deleteIndexRequest = message.getBody(DeleteIndexRequest.class);
+ message.setBody(client.admin().indices().delete(deleteIndexRequest).actionGet());
} else {
throw new IllegalArgumentException(ElasticsearchConstants.PARAM_OPERATION + " value '" + operation + "' is not supported");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/52e7be83/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 7e53fc1..8a8e2cc 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
@@ -24,6 +24,7 @@ import org.apache.camel.Converter;
import org.apache.camel.Exchange;
import org.apache.camel.component.elasticsearch.ElasticsearchConstants;
import org.elasticsearch.action.WriteConsistencyLevel;
+import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.exists.ExistsRequest;
@@ -165,6 +166,14 @@ public final class ElasticsearchActionRequestConverter {
ElasticsearchConstants.PARAM_INDEX_TYPE,
String.class)).id(id);
}
+
+ @Converter
+ public static DeleteIndexRequest toDeleteIndexRequest(String id, Exchange exchange) {
+ return new DeleteIndexRequest()
+ .indices(exchange.getIn().getHeader(
+ ElasticsearchConstants.PARAM_INDEX_NAME,
+ String.class));
+ }
@Converter
public static SearchRequest toSearchRequest(Object queryObject, Exchange exchange) {
[2/2] camel git commit: Fixed CS. This closes #1368
Posted by da...@apache.org.
Fixed CS. This closes #1368
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9fe0d69
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9fe0d69
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9fe0d69
Branch: refs/heads/master
Commit: a9fe0d69ebdba02cc562462957386275fff51970
Parents: 52e7be8
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 30 09:44:50 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 30 09:44:50 2016 +0100
----------------------------------------------------------------------
.../camel/component/elasticsearch/ElasticsearchProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a9fe0d69/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index 75164d2..55e9d3c 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -170,7 +170,7 @@ public class ElasticsearchProducer extends DefaultProducer {
MultiSearchRequest multiSearchRequest = message.getBody(MultiSearchRequest.class);
message.setBody(client.multiSearch(multiSearchRequest));
} else if (ElasticsearchConstants.OPERATION_DELETE_INDEX.equals(operation)) {
- DeleteIndexRequest deleteIndexRequest = message.getBody(DeleteIndexRequest.class);
+ DeleteIndexRequest deleteIndexRequest = message.getBody(DeleteIndexRequest.class);
message.setBody(client.admin().indices().delete(deleteIndexRequest).actionGet());
} else {
throw new IllegalArgumentException(ElasticsearchConstants.PARAM_OPERATION + " value '" + operation + "' is not supported");