This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 34ebb9aa0fb CAMEL-18728: Fix elasticsearch-rest component name to prevent component name clash (#8728) 34ebb9aa0fb is described below commit 34ebb9aa0fb62ee2997c7d1daa6a21e2ecc59e70 Author: ludovic-boutros <ludovic.bout...@zenika.com> AuthorDate: Sat Nov 19 19:29:43 2022 +0100 CAMEL-18728: Fix elasticsearch-rest component name to prevent component name clash (#8728) --- .../builder/endpoint/EndpointBuilderFactory.java | 1 + .../camel/builder/endpoint/EndpointBuilders.java | 1 + .../builder/endpoint/StaticEndpointBuilders.java | 8 +- .../dsl/ElasticsearchEndpointBuilderFactory.java | 120 +++++++++++++++------ ...> ElasticsearchRestEndpointBuilderFactory.java} | 107 +++++++++--------- .../camel/maven/packaging/EndpointDslMojo.java | 2 + 6 files changed, 153 insertions(+), 86 deletions(-) diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java index f79c0c225df..e69f3f47480 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java @@ -101,6 +101,7 @@ public interface EndpointBuilderFactory org.apache.camel.builder.endpoint.dsl.EKS2EndpointBuilderFactory.EKS2Builders, org.apache.camel.builder.endpoint.dsl.EhcacheEndpointBuilderFactory.EhcacheBuilders, org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory.ElasticsearchBuilders, + org.apache.camel.builder.endpoint.dsl.ElasticsearchRestEndpointBuilderFactory.ElasticsearchRestBuilders, org.apache.camel.builder.endpoint.dsl.Etcd3EndpointBuilderFactory.Etcd3Builders, org.apache.camel.builder.endpoint.dsl.EventEndpointBuilderFactory.EventBuilders, org.apache.camel.builder.endpoint.dsl.EventHubsEndpointBuilderFactory.EventHubsBuilders, diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java index 9b1b441f062..e7c88d9e4ce 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java @@ -98,6 +98,7 @@ public interface EndpointBuilders org.apache.camel.builder.endpoint.dsl.EKS2EndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.EhcacheEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory, + org.apache.camel.builder.endpoint.dsl.ElasticsearchRestEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.Etcd3EndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.EventEndpointBuilderFactory, org.apache.camel.builder.endpoint.dsl.EventHubsEndpointBuilderFactory, diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index a95ff7226f4..96cfb774a6c 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java @@ -4252,9 +4252,9 @@ public class StaticEndpointBuilders { * @return the dsl builder */ @Deprecated - public static org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory.ElasticsearchEndpointBuilder elasticsearchRest( + public static org.apache.camel.builder.endpoint.dsl.ElasticsearchRestEndpointBuilderFactory.ElasticsearchRestEndpointBuilder elasticsearchRest( String path) { - return org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory.endpointBuilder("elasticsearch-rest", path); + return org.apache.camel.builder.endpoint.dsl.ElasticsearchRestEndpointBuilderFactory.endpointBuilder("elasticsearch-rest", path); } /** * Elasticsearch Rest (camel-elasticsearch-rest) @@ -4275,10 +4275,10 @@ public class StaticEndpointBuilders { * @return the dsl builder */ @Deprecated - public static org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory.ElasticsearchEndpointBuilder elasticsearchRest( + public static org.apache.camel.builder.endpoint.dsl.ElasticsearchRestEndpointBuilderFactory.ElasticsearchRestEndpointBuilder elasticsearchRest( String componentName, String path) { - return org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory.endpointBuilder(componentName, path); + return org.apache.camel.builder.endpoint.dsl.ElasticsearchRestEndpointBuilderFactory.endpointBuilder(componentName, path); } /** * Etcd v3 (camel-etcd3) diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java index ae1d46de8a2..82e50eb4a3d 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java @@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder; import org.apache.camel.builder.endpoint.AbstractEndpointBuilder; /** - * Send requests to ElasticSearch via REST API + * Send requests to ElasticSearch via Java Client API. * * Generated by camel build tools - do NOT edit this file! */ @@ -35,7 +35,7 @@ public interface ElasticsearchEndpointBuilderFactory { /** - * Builder for endpoint for the Elasticsearch Rest component. + * Builder for endpoint for the Elasticsearch component. */ public interface ElasticsearchEndpointBuilder extends @@ -199,7 +199,7 @@ public interface ElasticsearchEndpointBuilderFactory { * What operation to perform. * * The option is a: - * <code>org.apache.camel.component.elasticsearch.ElasticsearchOperation</code> type. + * <code>org.apache.camel.component.es.ElasticsearchOperation</code> type. * * Group: producer * @@ -207,7 +207,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @return the dsl builder */ default ElasticsearchEndpointBuilder operation( - org.apache.camel.component.elasticsearch.ElasticsearchOperation operation) { + org.apache.camel.component.es.ElasticsearchOperation operation) { doSetProperty("operation", operation); return this; } @@ -215,7 +215,7 @@ public interface ElasticsearchEndpointBuilderFactory { * What operation to perform. * * The option will be converted to a - * <code>org.apache.camel.component.elasticsearch.ElasticsearchOperation</code> type. + * <code>org.apache.camel.component.es.ElasticsearchOperation</code> type. * * Group: producer * @@ -382,6 +382,22 @@ public interface ElasticsearchEndpointBuilderFactory { doSetProperty("waitForActiveShards", waitForActiveShards); return this; } + /** + * The path of the self-signed certificate to use to access to + * Elasticsearch. + * + * The option is a: <code>java.lang.String</code> type. + * + * Group: security + * + * @param certificatePath the value to set + * @return the dsl builder + */ + default ElasticsearchEndpointBuilder certificatePath( + String certificatePath) { + doSetProperty("certificatePath", certificatePath); + return this; + } /** * Enable SSL. * @@ -416,7 +432,7 @@ public interface ElasticsearchEndpointBuilderFactory { } /** - * Advanced builder for endpoint for the Elasticsearch Rest component. + * Advanced builder for endpoint for the Elasticsearch component. */ public interface AdvancedElasticsearchEndpointBuilder extends @@ -473,6 +489,40 @@ public interface ElasticsearchEndpointBuilderFactory { doSetProperty("lazyStartProducer", lazyStartProducer); return this; } + /** + * The class to use when deserializing the documents. + * + * The option is a: + * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type. + * + * Default: ObjectNode + * Group: advanced + * + * @param documentClass the value to set + * @return the dsl builder + */ + default AdvancedElasticsearchEndpointBuilder documentClass( + Class<java.lang.Object> documentClass) { + doSetProperty("documentClass", documentClass); + return this; + } + /** + * The class to use when deserializing the documents. + * + * The option will be converted to a + * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type. + * + * Default: ObjectNode + * Group: advanced + * + * @param documentClass the value to set + * @return the dsl builder + */ + default AdvancedElasticsearchEndpointBuilder documentClass( + String documentClass) { + doSetProperty("documentClass", documentClass); + return this; + } /** * Enable automatically discover nodes from a running Elasticsearch * cluster. If this option is used in conjunction with Spring Boot then @@ -586,27 +636,27 @@ public interface ElasticsearchEndpointBuilderFactory { public interface ElasticsearchBuilders { /** - * Elasticsearch Rest (camel-elasticsearch-rest) - * Send requests to ElasticSearch via REST API + * Elasticsearch (camel-elasticsearch) + * Send requests to ElasticSearch via Java Client API. * * Category: search,monitoring - * Since: 2.21 - * Maven coordinates: org.apache.camel:camel-elasticsearch-rest + * Since: 3.19 + * Maven coordinates: org.apache.camel:camel-elasticsearch * * @return the dsl builder for the headers' name. */ - default ElasticsearchHeaderNameBuilder elasticsearchRest() { + default ElasticsearchHeaderNameBuilder elasticsearch() { return ElasticsearchHeaderNameBuilder.INSTANCE; } /** - * Elasticsearch Rest (camel-elasticsearch-rest) - * Send requests to ElasticSearch via REST API + * Elasticsearch (camel-elasticsearch) + * Send requests to ElasticSearch via Java Client API. * * Category: search,monitoring - * Since: 2.21 - * Maven coordinates: org.apache.camel:camel-elasticsearch-rest + * Since: 3.19 + * Maven coordinates: org.apache.camel:camel-elasticsearch * - * Syntax: <code>elasticsearch-rest:clusterName</code> + * Syntax: <code>elasticsearch:clusterName</code> * * Path parameter: clusterName (required) * Name of the cluster @@ -614,19 +664,18 @@ public interface ElasticsearchEndpointBuilderFactory { * @param path clusterName * @return the dsl builder */ - @Deprecated - default ElasticsearchEndpointBuilder elasticsearchRest(String path) { - return ElasticsearchEndpointBuilderFactory.endpointBuilder("elasticsearch-rest", path); + default ElasticsearchEndpointBuilder elasticsearch(String path) { + return ElasticsearchEndpointBuilderFactory.endpointBuilder("elasticsearch", path); } /** - * Elasticsearch Rest (camel-elasticsearch-rest) - * Send requests to ElasticSearch via REST API + * Elasticsearch (camel-elasticsearch) + * Send requests to ElasticSearch via Java Client API. * * Category: search,monitoring - * Since: 2.21 - * Maven coordinates: org.apache.camel:camel-elasticsearch-rest + * Since: 3.19 + * Maven coordinates: org.apache.camel:camel-elasticsearch * - * Syntax: <code>elasticsearch-rest:clusterName</code> + * Syntax: <code>elasticsearch:clusterName</code> * * Path parameter: clusterName (required) * Name of the cluster @@ -636,8 +685,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param path clusterName * @return the dsl builder */ - @Deprecated - default ElasticsearchEndpointBuilder elasticsearchRest( + default ElasticsearchEndpointBuilder elasticsearch( String componentName, String path) { return ElasticsearchEndpointBuilderFactory.endpointBuilder(componentName, path); @@ -645,7 +693,7 @@ public interface ElasticsearchEndpointBuilderFactory { } /** - * The builder of headers' name for the Elasticsearch Rest component. + * The builder of headers' name for the Elasticsearch component. */ public static class ElasticsearchHeaderNameBuilder { /** @@ -658,8 +706,7 @@ public interface ElasticsearchEndpointBuilderFactory { * The operation to perform. * * The option is a: {@code - * org.apache.camel.component.elasticsearch.ElasticsearchOperation} - * type. + * org.apache.camel.component.es.ElasticsearchOperation} type. * * Group: producer * @@ -695,6 +742,20 @@ public interface ElasticsearchEndpointBuilderFactory { return "indexName"; } + /** + * The full qualified name of the class of the document to unmarshall. + * + * The option is a: {@code Class} type. + * + * Default: ObjectNode + * Group: producer + * + * @return the name of the header {@code documentClass}. + */ + public String documentClass() { + return "documentClass"; + } + /** * The index creation waits for the write consistency number of shards * to be available. @@ -761,7 +822,6 @@ public interface ElasticsearchEndpointBuilderFactory { return "from"; } } - @Deprecated static ElasticsearchEndpointBuilder endpointBuilder( String componentName, String path) { diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchRestEndpointBuilderFactory.java similarity index 85% copy from dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java copy to dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchRestEndpointBuilderFactory.java index ae1d46de8a2..e0c8a985ab9 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchRestEndpointBuilderFactory.java @@ -31,17 +31,17 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder; * Generated by camel build tools - do NOT edit this file! */ @Generated("org.apache.camel.maven.packaging.EndpointDslMojo") -public interface ElasticsearchEndpointBuilderFactory { +public interface ElasticsearchRestEndpointBuilderFactory { /** * Builder for endpoint for the Elasticsearch Rest component. */ - public interface ElasticsearchEndpointBuilder + public interface ElasticsearchRestEndpointBuilder extends EndpointProducerBuilder { - default AdvancedElasticsearchEndpointBuilder advanced() { - return (AdvancedElasticsearchEndpointBuilder) this; + default AdvancedElasticsearchRestEndpointBuilder advanced() { + return (AdvancedElasticsearchRestEndpointBuilder) this; } /** * The time in ms to wait before connection will timeout. @@ -54,7 +54,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param connectionTimeout the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder connectionTimeout( + default ElasticsearchRestEndpointBuilder connectionTimeout( int connectionTimeout) { doSetProperty("connectionTimeout", connectionTimeout); return this; @@ -70,7 +70,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param connectionTimeout the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder connectionTimeout( + default ElasticsearchRestEndpointBuilder connectionTimeout( String connectionTimeout) { doSetProperty("connectionTimeout", connectionTimeout); return this; @@ -86,7 +86,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param disconnect the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder disconnect(boolean disconnect) { + default ElasticsearchRestEndpointBuilder disconnect(boolean disconnect) { doSetProperty("disconnect", disconnect); return this; } @@ -102,7 +102,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param disconnect the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder disconnect(String disconnect) { + default ElasticsearchRestEndpointBuilder disconnect(String disconnect) { doSetProperty("disconnect", disconnect); return this; } @@ -116,7 +116,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param from the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder from(Integer from) { + default ElasticsearchRestEndpointBuilder from(Integer from) { doSetProperty("from", from); return this; } @@ -131,7 +131,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param from the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder from(String from) { + default ElasticsearchRestEndpointBuilder from(String from) { doSetProperty("from", from); return this; } @@ -146,7 +146,8 @@ public interface ElasticsearchEndpointBuilderFactory { * @param hostAddresses the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder hostAddresses(String hostAddresses) { + default ElasticsearchRestEndpointBuilder hostAddresses( + String hostAddresses) { doSetProperty("hostAddresses", hostAddresses); return this; } @@ -160,7 +161,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param indexName the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder indexName(String indexName) { + default ElasticsearchRestEndpointBuilder indexName(String indexName) { doSetProperty("indexName", indexName); return this; } @@ -175,7 +176,8 @@ public interface ElasticsearchEndpointBuilderFactory { * @param maxRetryTimeout the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder maxRetryTimeout(int maxRetryTimeout) { + default ElasticsearchRestEndpointBuilder maxRetryTimeout( + int maxRetryTimeout) { doSetProperty("maxRetryTimeout", maxRetryTimeout); return this; } @@ -190,7 +192,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param maxRetryTimeout the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder maxRetryTimeout( + default ElasticsearchRestEndpointBuilder maxRetryTimeout( String maxRetryTimeout) { doSetProperty("maxRetryTimeout", maxRetryTimeout); return this; @@ -206,7 +208,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param operation the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder operation( + default ElasticsearchRestEndpointBuilder operation( org.apache.camel.component.elasticsearch.ElasticsearchOperation operation) { doSetProperty("operation", operation); return this; @@ -222,7 +224,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param operation the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder operation(String operation) { + default ElasticsearchRestEndpointBuilder operation(String operation) { doSetProperty("operation", operation); return this; } @@ -237,7 +239,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param scrollKeepAliveMs the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder scrollKeepAliveMs( + default ElasticsearchRestEndpointBuilder scrollKeepAliveMs( int scrollKeepAliveMs) { doSetProperty("scrollKeepAliveMs", scrollKeepAliveMs); return this; @@ -253,7 +255,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param scrollKeepAliveMs the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder scrollKeepAliveMs( + default ElasticsearchRestEndpointBuilder scrollKeepAliveMs( String scrollKeepAliveMs) { doSetProperty("scrollKeepAliveMs", scrollKeepAliveMs); return this; @@ -268,7 +270,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param size the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder size(Integer size) { + default ElasticsearchRestEndpointBuilder size(Integer size) { doSetProperty("size", size); return this; } @@ -283,7 +285,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param size the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder size(String size) { + default ElasticsearchRestEndpointBuilder size(String size) { doSetProperty("size", size); return this; } @@ -298,7 +300,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param socketTimeout the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder socketTimeout(int socketTimeout) { + default ElasticsearchRestEndpointBuilder socketTimeout(int socketTimeout) { doSetProperty("socketTimeout", socketTimeout); return this; } @@ -313,7 +315,8 @@ public interface ElasticsearchEndpointBuilderFactory { * @param socketTimeout the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder socketTimeout(String socketTimeout) { + default ElasticsearchRestEndpointBuilder socketTimeout( + String socketTimeout) { doSetProperty("socketTimeout", socketTimeout); return this; } @@ -328,7 +331,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param useScroll the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder useScroll(boolean useScroll) { + default ElasticsearchRestEndpointBuilder useScroll(boolean useScroll) { doSetProperty("useScroll", useScroll); return this; } @@ -344,7 +347,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param useScroll the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder useScroll(String useScroll) { + default ElasticsearchRestEndpointBuilder useScroll(String useScroll) { doSetProperty("useScroll", useScroll); return this; } @@ -360,7 +363,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param waitForActiveShards the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder waitForActiveShards( + default ElasticsearchRestEndpointBuilder waitForActiveShards( int waitForActiveShards) { doSetProperty("waitForActiveShards", waitForActiveShards); return this; @@ -377,7 +380,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param waitForActiveShards the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder waitForActiveShards( + default ElasticsearchRestEndpointBuilder waitForActiveShards( String waitForActiveShards) { doSetProperty("waitForActiveShards", waitForActiveShards); return this; @@ -393,7 +396,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param enableSSL the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder enableSSL(boolean enableSSL) { + default ElasticsearchRestEndpointBuilder enableSSL(boolean enableSSL) { doSetProperty("enableSSL", enableSSL); return this; } @@ -409,7 +412,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param enableSSL the value to set * @return the dsl builder */ - default ElasticsearchEndpointBuilder enableSSL(String enableSSL) { + default ElasticsearchRestEndpointBuilder enableSSL(String enableSSL) { doSetProperty("enableSSL", enableSSL); return this; } @@ -418,11 +421,11 @@ public interface ElasticsearchEndpointBuilderFactory { /** * Advanced builder for endpoint for the Elasticsearch Rest component. */ - public interface AdvancedElasticsearchEndpointBuilder + public interface AdvancedElasticsearchRestEndpointBuilder extends EndpointProducerBuilder { - default ElasticsearchEndpointBuilder basic() { - return (ElasticsearchEndpointBuilder) this; + default ElasticsearchRestEndpointBuilder basic() { + return (ElasticsearchRestEndpointBuilder) this; } /** * Whether the producer should be started lazy (on the first message). @@ -443,7 +446,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param lazyStartProducer the value to set * @return the dsl builder */ - default AdvancedElasticsearchEndpointBuilder lazyStartProducer( + default AdvancedElasticsearchRestEndpointBuilder lazyStartProducer( boolean lazyStartProducer) { doSetProperty("lazyStartProducer", lazyStartProducer); return this; @@ -468,7 +471,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param lazyStartProducer the value to set * @return the dsl builder */ - default AdvancedElasticsearchEndpointBuilder lazyStartProducer( + default AdvancedElasticsearchRestEndpointBuilder lazyStartProducer( String lazyStartProducer) { doSetProperty("lazyStartProducer", lazyStartProducer); return this; @@ -487,7 +490,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param enableSniffer the value to set * @return the dsl builder */ - default AdvancedElasticsearchEndpointBuilder enableSniffer( + default AdvancedElasticsearchRestEndpointBuilder enableSniffer( boolean enableSniffer) { doSetProperty("enableSniffer", enableSniffer); return this; @@ -507,7 +510,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param enableSniffer the value to set * @return the dsl builder */ - default AdvancedElasticsearchEndpointBuilder enableSniffer( + default AdvancedElasticsearchRestEndpointBuilder enableSniffer( String enableSniffer) { doSetProperty("enableSniffer", enableSniffer); return this; @@ -524,7 +527,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param sniffAfterFailureDelay the value to set * @return the dsl builder */ - default AdvancedElasticsearchEndpointBuilder sniffAfterFailureDelay( + default AdvancedElasticsearchRestEndpointBuilder sniffAfterFailureDelay( int sniffAfterFailureDelay) { doSetProperty("sniffAfterFailureDelay", sniffAfterFailureDelay); return this; @@ -541,7 +544,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param sniffAfterFailureDelay the value to set * @return the dsl builder */ - default AdvancedElasticsearchEndpointBuilder sniffAfterFailureDelay( + default AdvancedElasticsearchRestEndpointBuilder sniffAfterFailureDelay( String sniffAfterFailureDelay) { doSetProperty("sniffAfterFailureDelay", sniffAfterFailureDelay); return this; @@ -559,7 +562,7 @@ public interface ElasticsearchEndpointBuilderFactory { * @param snifferInterval the value to set * @return the dsl builder */ - default AdvancedElasticsearchEndpointBuilder snifferInterval( + default AdvancedElasticsearchRestEndpointBuilder snifferInterval( int snifferInterval) { doSetProperty("snifferInterval", snifferInterval); return this; @@ -577,14 +580,14 @@ public interface ElasticsearchEndpointBuilderFactory { * @param snifferInterval the value to set * @return the dsl builder */ - default AdvancedElasticsearchEndpointBuilder snifferInterval( + default AdvancedElasticsearchRestEndpointBuilder snifferInterval( String snifferInterval) { doSetProperty("snifferInterval", snifferInterval); return this; } } - public interface ElasticsearchBuilders { + public interface ElasticsearchRestBuilders { /** * Elasticsearch Rest (camel-elasticsearch-rest) * Send requests to ElasticSearch via REST API @@ -595,8 +598,8 @@ public interface ElasticsearchEndpointBuilderFactory { * * @return the dsl builder for the headers' name. */ - default ElasticsearchHeaderNameBuilder elasticsearchRest() { - return ElasticsearchHeaderNameBuilder.INSTANCE; + default ElasticsearchRestHeaderNameBuilder elasticsearchRest() { + return ElasticsearchRestHeaderNameBuilder.INSTANCE; } /** * Elasticsearch Rest (camel-elasticsearch-rest) @@ -615,8 +618,8 @@ public interface ElasticsearchEndpointBuilderFactory { * @return the dsl builder */ @Deprecated - default ElasticsearchEndpointBuilder elasticsearchRest(String path) { - return ElasticsearchEndpointBuilderFactory.endpointBuilder("elasticsearch-rest", path); + default ElasticsearchRestEndpointBuilder elasticsearchRest(String path) { + return ElasticsearchRestEndpointBuilderFactory.endpointBuilder("elasticsearch-rest", path); } /** * Elasticsearch Rest (camel-elasticsearch-rest) @@ -637,22 +640,22 @@ public interface ElasticsearchEndpointBuilderFactory { * @return the dsl builder */ @Deprecated - default ElasticsearchEndpointBuilder elasticsearchRest( + default ElasticsearchRestEndpointBuilder elasticsearchRest( String componentName, String path) { - return ElasticsearchEndpointBuilderFactory.endpointBuilder(componentName, path); + return ElasticsearchRestEndpointBuilderFactory.endpointBuilder(componentName, path); } } /** * The builder of headers' name for the Elasticsearch Rest component. */ - public static class ElasticsearchHeaderNameBuilder { + public static class ElasticsearchRestHeaderNameBuilder { /** * The internal instance of the builder used to access to all the * methods representing the name of headers. */ - private static final ElasticsearchHeaderNameBuilder INSTANCE = new ElasticsearchHeaderNameBuilder(); + private static final ElasticsearchRestHeaderNameBuilder INSTANCE = new ElasticsearchRestHeaderNameBuilder(); /** * The operation to perform. @@ -762,14 +765,14 @@ public interface ElasticsearchEndpointBuilderFactory { } } @Deprecated - static ElasticsearchEndpointBuilder endpointBuilder( + static ElasticsearchRestEndpointBuilder endpointBuilder( String componentName, String path) { - class ElasticsearchEndpointBuilderImpl extends AbstractEndpointBuilder implements ElasticsearchEndpointBuilder, AdvancedElasticsearchEndpointBuilder { - public ElasticsearchEndpointBuilderImpl(String path) { + class ElasticsearchRestEndpointBuilderImpl extends AbstractEndpointBuilder implements ElasticsearchRestEndpointBuilder, AdvancedElasticsearchRestEndpointBuilder { + public ElasticsearchRestEndpointBuilderImpl(String path) { super(componentName, path); } } - return new ElasticsearchEndpointBuilderImpl(path); + return new ElasticsearchRestEndpointBuilderImpl(path); } } \ No newline at end of file diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java index 986fe6ebb6b..b64b3b56fb3 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java @@ -1003,6 +1003,8 @@ public class EndpointDslMojo extends AbstractGeneratorMojo { return "ZooKeeperMaster"; case "org.apache.camel.component.jetty9.JettyHttpComponent9": return "JettyHttp"; + case "org.apache.camel.component.elasticsearch.ElasticsearchComponent": + return "ElasticsearchRest"; default: return name; }