This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f318625e410c2793b133b509589b64fa4d748d42
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu May 8 14:27:24 2025 +0200
CAMEL-22013 - camel-api - Remove all usage of component.extension and the
component.extension package content itself - Elasticsearch
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../camel/component/es/ElasticsearchComponent.java | 1 -
.../ElasticsearchComponentVerifierExtension.java | 89 ----------------------
...lasticsearchComponentVerifierExtensionTest.java | 65 ----------------
3 files changed, 155 deletions(-)
diff --git
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponent.java
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponent.java
index 8a39562ab37..2a8fb039a7b 100644
---
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponent.java
+++
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponent.java
@@ -68,7 +68,6 @@ public class ElasticsearchComponent extends DefaultComponent {
public ElasticsearchComponent(CamelContext context) {
super(context);
- registerExtension(new ElasticsearchComponentVerifierExtension());
}
@Override
diff --git
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponentVerifierExtension.java
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponentVerifierExtension.java
deleted file mode 100644
index 6460cd609af..00000000000
---
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/es/ElasticsearchComponentVerifierExtension.java
+++ /dev/null
@@ -1,89 +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.es;
-
-import java.io.IOException;
-import java.util.Map;
-
-import co.elastic.clients.elasticsearch.ElasticsearchClient;
-import co.elastic.clients.json.jackson.JacksonJsonpMapper;
-import co.elastic.clients.transport.ElasticsearchTransport;
-import co.elastic.clients.transport.rest_client.RestClientTransport;
-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;
-
-public class ElasticsearchComponentVerifierExtension extends
DefaultComponentVerifierExtension {
-
- public ElasticsearchComponentVerifierExtension() {
- this("elasticsearch");
- }
-
- public ElasticsearchComponentVerifierExtension(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(parameters,
"clusterName"))
- .error(ResultErrorHelper.requiresOption(parameters,
"hostAddresses"));
- // 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]));
- try (ElasticsearchTransport transport = new
RestClientTransport(clientBuilder.build(), new JacksonJsonpMapper())) {
- ElasticsearchClient esClient = new
ElasticsearchClient(transport);
- esClient.ping();
- }
- } catch (IOException e) {
- ResultErrorBuilder errorBuilder
- =
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION,
e.getMessage())
- .detail("elasticsearch_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/src/test/java/org/apache/camel/component/es/ElasticsearchComponentVerifierExtensionTest.java
b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/ElasticsearchComponentVerifierExtensionTest.java
deleted file mode 100644
index 181f1c480d3..00000000000
---
a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/ElasticsearchComponentVerifierExtensionTest.java
+++ /dev/null
@@ -1,65 +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.es;
-
-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.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class ElasticsearchComponentVerifierExtensionTest extends CamelTestSupport {
- @Override
- public boolean isUseRouteBuilder() {
- return false;
- }
-
- @Test
- void testParameters() {
- Component component = context().getComponent("elasticsearch");
-
- 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);
-
- assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
- }
-
- @Test
- void testConnectivity() {
- Component component = context().getComponent("elasticsearch");
- 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);
-
- assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- }
-
-}
