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 2019/09/05 10:47:04 UTC
[camel] branch master updated (677dd58 -> 23cabb8)
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 677dd58 Upgrade Protobuf to version 3.9.1
new 533a6fb Revert "Revert "Upgrade Elasticsearch and related bundle to version 7.3.1""
new 058e698 Revert "Revert "Upgrade Elasticsearch cluster runner to version 7.3.1""
new d237bee Revert "Revert "Fixed ElasticSearchInfoTest after upgrading to 7.3.1""
new 59f0281 CAMEL-13945 - Camel-elasticsearch-rest: Remove info operation from producer
new 908d060 CAMEL-13945 - Camel-elasticsearch-rest: Remove info operation from producer, remove refs from docs
new 23cabb8 Regen docs
The 6 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 | 1 -
.../elasticsearch/ElasticsearchOperation.java | 3 +-
.../elasticsearch/ElasticsearchProducer.java | 2 --
.../elasticsearch/ElasticsearchInfoTest.java | 41 ----------------------
.../dsl/ElasticsearchEndpointBuilderFactory.java | 3 +-
.../ROOT/pages/elasticsearch-rest-component.adoc | 1 -
parent/pom.xml | 8 ++---
7 files changed, 6 insertions(+), 53 deletions(-)
delete mode 100644 components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java
[camel] 03/06: Revert "Revert "Fixed ElasticSearchInfoTest after
upgrading to 7.3.1""
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 d237beebd46ae448bc35ec362b8eeae3afcf487e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 5 12:35:03 2019 +0200
Revert "Revert "Fixed ElasticSearchInfoTest after upgrading to 7.3.1""
This reverts commit 1eb00d8243299fc14a045fef02b71c86f3595f0b.
---
.../org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java
index a156ced..0897d00 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.elasticsearch;
import org.apache.camel.builder.RouteBuilder;
-import org.elasticsearch.action.main.MainResponse;
+import org.elasticsearch.client.core.MainResponse;
import org.junit.Test;
public class ElasticsearchInfoTest extends ElasticsearchBaseTest {
[camel] 02/06: Revert "Revert "Upgrade Elasticsearch cluster runner
to version 7.3.1""
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 058e698f454f5fef698829f2954a1e83dec2bc51
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 5 12:34:53 2019 +0200
Revert "Revert "Upgrade Elasticsearch cluster runner to version 7.3.1""
This reverts commit 377b5c9256a59bf27aa27cbe66066c487395a3ed.
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index bfececd..a78245e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -177,7 +177,7 @@
<ehcache3-version>3.7.0</ehcache3-version>
<ekstazi-maven-plugin-version>5.3.0</ekstazi-maven-plugin-version>
<elasticsearch-rest-sniffer-version>7.3.1</elasticsearch-rest-sniffer-version>
- <elasticsearch-rest-cluster-runner-version>7.1.1.0</elasticsearch-rest-cluster-runner-version>
+ <elasticsearch-rest-cluster-runner-version>7.3.1.0</elasticsearch-rest-cluster-runner-version>
<elasticsearch-rest-version>7.3.1</elasticsearch-rest-version>
<elasticsearch-rest-bundle-version>7.3.1_1</elasticsearch-rest-bundle-version>
<elsql-version>1.3</elsql-version>
[camel] 05/06: CAMEL-13945 - Camel-elasticsearch-rest: Remove info
operation from producer, remove refs from 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 908d06083b45b66eef2f6ea8390ad726a6009913
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 5 12:43:53 2019 +0200
CAMEL-13945 - Camel-elasticsearch-rest: Remove info operation from producer, remove refs from docs
---
.../src/main/docs/elasticsearch-rest-component.adoc | 1 -
1 file changed, 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 1d06337..da6ef7d 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
@@ -178,7 +178,6 @@ indexId in the body.
|Ping |None |Pings the remote Elasticsearch cluster and returns true if the ping succeeded, false otherwise
-|Info |None |Get the info of the Elasticsearch cluster and returns them as MainResponse class instance
|===
== Configure the component and enable basic authentication
[camel] 01/06: Revert "Revert "Upgrade Elasticsearch and related
bundle to version 7.3.1""
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 533a6fb392f0fffaee8a5a0c7e8af73ebbd676e1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 5 12:34:42 2019 +0200
Revert "Revert "Upgrade Elasticsearch and related bundle to version 7.3.1""
This reverts commit 9c7c7ba06acae415df1ae08d32348a7396d806aa.
---
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a22a4b2..bfececd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -176,10 +176,10 @@
<ehcache-version>2.10.6</ehcache-version>
<ehcache3-version>3.7.0</ehcache3-version>
<ekstazi-maven-plugin-version>5.3.0</ekstazi-maven-plugin-version>
- <elasticsearch-rest-sniffer-version>7.1.1</elasticsearch-rest-sniffer-version>
+ <elasticsearch-rest-sniffer-version>7.3.1</elasticsearch-rest-sniffer-version>
<elasticsearch-rest-cluster-runner-version>7.1.1.0</elasticsearch-rest-cluster-runner-version>
- <elasticsearch-rest-version>7.1.1</elasticsearch-rest-version>
- <elasticsearch-rest-bundle-version>7.1.1_1</elasticsearch-rest-bundle-version>
+ <elasticsearch-rest-version>7.3.1</elasticsearch-rest-version>
+ <elasticsearch-rest-bundle-version>7.3.1_1</elasticsearch-rest-bundle-version>
<elsql-version>1.3</elsql-version>
<eddsa-version>0.3.0</eddsa-version>
<embedmongo-version>2.1.1</embedmongo-version>
[camel] 04/06: CAMEL-13945 - Camel-elasticsearch-rest: Remove info
operation from producer
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 59f0281ad1945f27d475a3f3791282d818126d9b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 5 12:40:17 2019 +0200
CAMEL-13945 - Camel-elasticsearch-rest: Remove info operation from producer
---
.../elasticsearch/ElasticsearchOperation.java | 3 +-
.../elasticsearch/ElasticsearchProducer.java | 2 --
.../elasticsearch/ElasticsearchInfoTest.java | 41 ----------------------
.../dsl/ElasticsearchEndpointBuilderFactory.java | 3 +-
4 files changed, 2 insertions(+), 47 deletions(-)
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 cf50906..1c78736 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
@@ -41,8 +41,7 @@ public enum ElasticsearchOperation {
DeleteIndex("DeleteIndex"),
Search("Search"),
Exists("Exists"),
- Ping("Ping"),
- Info("Info");
+ Ping("Ping");
private final String text;
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 ab92790..66fc65b 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
@@ -202,8 +202,6 @@ public class ElasticsearchProducer extends DefaultProducer {
message.setBody(restHighLevelClient.msearch(searchRequest, RequestOptions.DEFAULT).getResponses());
} else if (operation == ElasticsearchOperation.Ping) {
message.setBody(restHighLevelClient.ping(RequestOptions.DEFAULT));
- } else if (operation == ElasticsearchOperation.Info) {
- message.setBody(restHighLevelClient.info(RequestOptions.DEFAULT));
} else {
throw new IllegalArgumentException(ElasticsearchConstants.PARAM_OPERATION + " value '" + operation + "' is not supported");
}
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java
deleted file mode 100644
index 0897d00..0000000
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchInfoTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.elasticsearch;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.elasticsearch.client.core.MainResponse;
-import org.junit.Test;
-
-public class ElasticsearchInfoTest extends ElasticsearchBaseTest {
-
- @Test
- public void testInfo() throws Exception {
- MainResponse infoResult = template.requestBody("direct:info", "test", MainResponse.class);
- assertNotNull(infoResult.getClusterName());
- assertNotNull(infoResult.getNodeName());
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() {
- from("direct:info").to("elasticsearch-rest://elasticsearch?operation=Info&hostAddresses=localhost:" + ES_BASE_HTTP_PORT);
- }
- };
- }
-}
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index de67af3..f07c32d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -355,8 +355,7 @@ public interface ElasticsearchEndpointBuilderFactory {
DeleteIndex,
Search,
Exists,
- Ping,
- Info;
+ Ping;
}
/**
* Elastichsearch Rest (camel-elasticsearch-rest)
[camel] 06/06: Regen 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 23cabb894e48400cad14a064888cc72b55733eba
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 5 12:46:37 2019 +0200
Regen docs
---
docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc | 1 -
1 file changed, 1 deletion(-)
diff --git a/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc b/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc
index ab41b8e..46286de 100644
--- a/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc
+++ b/docs/components/modules/ROOT/pages/elasticsearch-rest-component.adoc
@@ -179,7 +179,6 @@ indexId in the body.
|Ping |None |Pings the remote Elasticsearch cluster and returns true if the ping succeeded, false otherwise
-|Info |None |Get the info of the Elasticsearch cluster and returns them as MainResponse class instance
|===
== Configure the component and enable basic authentication