Repository: camel Updated Branches: refs/heads/master 880a39013 -> e6aa74d8c
CAMEL-11285: Camel-Elasticsearch5: Upgrade to Elasticsearch 5.3.x Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e6aa74d8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e6aa74d8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e6aa74d8 Branch: refs/heads/master Commit: e6aa74d8c1fb49d1f5a86c1dd46bfc72b7e5ae1c Parents: 880a390 Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue May 16 14:42:48 2017 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue May 16 14:59:13 2017 +0200 ---------------------------------------------------------------------- .../aggregation/BulkRequestAggregationStrategy.java | 7 ++++--- .../camel/component/elasticsearch5/ElasticsearchBaseTest.java | 2 +- parent/pom.xml | 6 +++--- platforms/karaf/features/src/main/resources/features.xml | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e6aa74d8/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/aggregation/BulkRequestAggregationStrategy.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/aggregation/BulkRequestAggregationStrategy.java b/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/aggregation/BulkRequestAggregationStrategy.java index 4fec8f6..9f60eb4 100644 --- a/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/aggregation/BulkRequestAggregationStrategy.java +++ b/components/camel-elasticsearch5/src/main/java/org/apache/camel/component/elasticsearch5/aggregation/BulkRequestAggregationStrategy.java @@ -20,6 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.InvalidPayloadRuntimeException; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.elasticsearch.action.ActionRequest; +import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.bulk.BulkRequest; /** @@ -31,11 +32,11 @@ public class BulkRequestAggregationStrategy implements AggregationStrategy { public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { // Don't use getBody(Class<T>) here as we don't want to coerce the body type using a type converter. Object objBody = newExchange.getIn().getBody(); - if (!(objBody instanceof ActionRequest)) { - throw new InvalidPayloadRuntimeException(newExchange, ActionRequest.class); + if (!(objBody instanceof DocWriteRequest[])) { + throw new InvalidPayloadRuntimeException(newExchange, DocWriteRequest[].class); } - ActionRequest newBody = (ActionRequest) objBody; + DocWriteRequest[] newBody = (DocWriteRequest[]) objBody; BulkRequest request; if (oldExchange == null) { request = new BulkRequest(); http://git-wip-us.apache.org/repos/asf/camel/blob/e6aa74d8/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java index f02bf1e..99885ff 100644 --- a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java +++ b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java @@ -29,8 +29,8 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.InetSocketTransportAddress; +import org.elasticsearch.node.InternalSettingsPreparer; import org.elasticsearch.node.Node; -import org.elasticsearch.node.internal.InternalSettingsPreparer; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.transport.Netty4Plugin; import org.elasticsearch.transport.client.PreBuiltTransportClient; http://git-wip-us.apache.org/repos/asf/camel/blob/e6aa74d8/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 3af9032..5c23157 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -186,10 +186,10 @@ <elasticsearch-bundle-version>2.4.4_1</elasticsearch-bundle-version> <elasticsearch-guava-version>18.0</elasticsearch-guava-version> <elasticsearch-version>2.4.4</elasticsearch-version> - <elasticsearch5-version>5.2.2</elasticsearch5-version> - <elasticsearch5-bundle-version>5.2.2_1</elasticsearch5-bundle-version> + <elasticsearch5-version>5.3.2</elasticsearch5-version> + <elasticsearch5-bundle-version>5.3.2_1</elasticsearch5-bundle-version> <elasticsearch-cluster-runner-version>2.4.0.0</elasticsearch-cluster-runner-version> - <elasticsearch5-cluster-runner-version>5.2.2.0</elasticsearch5-cluster-runner-version> + <elasticsearch5-cluster-runner-version>5.3.2.0</elasticsearch5-cluster-runner-version> <elsql-version>1.2</elsql-version> <el-api-1.0-version>1.0.1</el-api-1.0-version> <!-- embedmongo 1.50.2 do not work --> http://git-wip-us.apache.org/repos/asf/camel/blob/e6aa74d8/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 321496a..887a2ed 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -524,7 +524,7 @@ <bundle dependency='true'>mvn:com.ning/compress-lzf/${compress-lzf-version}</bundle> <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch5-bundle-version}</bundle> - <bundle dependency='true'>wrap:mvn:org.elasticsearch.client/transport/${elasticsearch5-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch-client/${elasticsearch5-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-elasticsearch5/${project.version}</bundle> </feature> <feature name='camel-etcd' version='${project.version}' resolver='(obr)' start-level='50'>
