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 649f83abf2d0f37d93fc311658872f73777c4a2c
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Mar 22 10:35:03 2018 +0100
CAMEL-12392 - Camel-Elasticsearch-rest: Add a component verifier extension
---
.../elasticsearch/ElasticsearchComponent.java | 3 +-
...lasticsearchRestComponentVerifierExtension.java | 81 ++++++++++++++++++++++
...icsearchRestComponentVerifierExtensionTest.java | 66 ++++++++++++++++++
3 files changed, 149 insertions(+), 1 deletion(-)
diff --git
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
index b36d8a6..3bd3282 100644
---
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
+++
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
@@ -59,11 +59,12 @@ public class ElasticsearchComponent extends
DefaultComponent {
private int sniffAfterFailureDelay =
ElasticsearchConstants.DEFAULT_AFTER_FAILURE_DELAY;
public ElasticsearchComponent() {
- super();
+ this(null);
}
public ElasticsearchComponent(CamelContext context) {
super(context);
+ registerExtension(new ElasticsearchRestComponentVerifierExtension());
}
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
diff --git
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchRestComponentVerifierExtension.java
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchRestComponentVerifierExtension.java
new file mode 100644
index 0000000..3609185
--- /dev/null
+++
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchRestComponentVerifierExtension.java
@@ -0,0 +1,81 @@
+/**
+ * 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 java.io.IOException;
+import java.util.Map;
+
+import
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
+import org.apache.camel.component.extension.verifier.ResultBuilder;
+import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
+import org.apache.camel.component.extension.verifier.ResultErrorHelper;
+import org.apache.http.HttpHost;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.elasticsearch.client.RestHighLevelClient;
+
+public class ElasticsearchRestComponentVerifierExtension extends
DefaultComponentVerifierExtension {
+
+ public ElasticsearchRestComponentVerifierExtension() {
+ this("elasticsearch-rest");
+ }
+
+ public ElasticsearchRestComponentVerifierExtension(String scheme) {
+ super(scheme);
+ }
+
+ // *********************************
+ // Parameters validation
+ // *********************************
+
+ @Override
+ protected Result verifyParameters(Map<String, Object> parameters) {
+
+ ResultBuilder builder =
ResultBuilder.withStatusAndScope(Result.Status.OK,
Scope.PARAMETERS).error(ResultErrorHelper.requiresOption("clusterName",
parameters))
+
.error(ResultErrorHelper.requiresOption("hostAddresses", parameters));
+ // Validate using the catalog
+
+ super.verifyParametersAgainstCatalog(builder, parameters);
+
+ return builder.build();
+ }
+
+ // *********************************
+ // Connectivity validation
+ // *********************************
+
+ @Override
+ protected Result verifyConnectivity(Map<String, Object> parameters) {
+ ResultBuilder builder =
ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.CONNECTIVITY);
+
+ try {
+ ElasticsearchConfiguration configuration = setProperties(new
ElasticsearchConfiguration(), parameters);
+ RestClientBuilder clientBuilder =
RestClient.builder(configuration.getHostAddressesList().toArray(new
HttpHost[0]));
+ RestHighLevelClient restHighLevelClient = new
RestHighLevelClient(clientBuilder);
+ restHighLevelClient.ping();
+ } catch (IOException e) {
+ ResultErrorBuilder errorBuilder =
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION,
e.getMessage())
+ .detail("elasticsearch_rest_exception_message",
e.getMessage()).detail(VerificationError.ExceptionAttribute.EXCEPTION_CLASS,
e.getClass().getName())
+
.detail(VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE, e);
+
+ builder.error(errorBuilder.build());
+ } catch (Exception e) {
+ builder.error(ResultErrorBuilder.withException(e).build());
+ }
+ return builder.build();
+ }
+}
diff --git
a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchRestComponentVerifierExtensionTest.java
b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchRestComponentVerifierExtensionTest.java
new file mode 100644
index 0000000..91bbde4
--- /dev/null
+++
b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchRestComponentVerifierExtensionTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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 java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.Component;
+import org.apache.camel.component.extension.ComponentVerifierExtension;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ElasticsearchRestComponentVerifierExtensionTest extends
CamelTestSupport {
+
+ // *************************************************
+ // Tests (parameters)
+ // *************************************************
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ @Test
+ public void testParameters() throws Exception {
+ Component component = context().getComponent("elasticsearch-rest");
+
+ ComponentVerifierExtension verifier =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
+
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("hostAddresses", "http://localhost:9000";);
+ parameters.put("clusterName", "es-test");
+
+ ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
+
+ Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
+ }
+
+ @Test
+ public void testConnectivity() throws Exception {
+ Component component = context().getComponent("elasticsearch-rest");
+ ComponentVerifierExtension verifier =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
+
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("hostAddresses", "http://localhost:9000";);
+
+ ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
+
+ Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
