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 46641dd290df0386667aa321efe775a694cc15e4 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Nov 18 15:05:21 2020 +0100 CAMEL-15836 - Camel-AWS2-Athena: enable autowire on the Athena Client, Regen component and configurers --- .../camel/catalog/docs/aws2-athena-component.adoc | 10 +++----- .../aws2/athena/Athena2ComponentConfigurer.java | 11 ++++---- .../aws2/athena/Athena2EndpointConfigurer.java | 11 ++++---- .../aws2/athena/Athena2EndpointUriFactory.java | 3 +-- .../camel/component/aws2/athena/aws2-athena.json | 6 ++--- .../src/main/docs/aws2-athena-component.adoc | 10 +++----- .../component/aws2/athena/Athena2Component.java | 3 --- .../dsl/Aws2AthenaComponentBuilderFactory.java | 16 ------------ .../dsl/Athena2EndpointBuilderFactory.java | 30 ---------------------- .../modules/ROOT/pages/aws2-athena-component.adoc | 10 +++----- 10 files changed, 25 insertions(+), 85 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-athena-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-athena-component.adoc index cbf0b17..5a0dc2b 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-athena-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-athena-component.adoc @@ -60,7 +60,7 @@ from("direct:start") // component options: START -The AWS 2 Athena component supports 30 options, which are listed below. +The AWS 2 Athena component supports 29 options, which are listed below. @@ -68,8 +68,7 @@ The AWS 2 Athena component supports 30 options, which are listed below. |=== | Name | Description | Default | Type | *accessKey* (producer) | Amazon AWS Access Key. | | String -| *amazonAthenaClient* (producer) | The AmazonAthena instance to use as the client. | | AthenaClient -| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean +| *amazonAthenaClient* (producer) | *Autowired* The AmazonAthena instance to use as the client. | | AthenaClient | *configuration* (producer) | The component configuration. | | Athena2Configuration | *database* (producer) | The Athena database to use. | | String | *delay* (producer) | Milliseconds before the next poll for query execution status. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 2000 | long @@ -129,15 +128,14 @@ with the following path and query parameters: |=== -=== Query Parameters (29 parameters): +=== Query Parameters (28 parameters): [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean | *accessKey* (producer) | Amazon AWS Access Key. | | String -| *amazonAthenaClient* (producer) | The AmazonAthena instance to use as the client. | | AthenaClient +| *amazonAthenaClient* (producer) | *Autowired* The AmazonAthena instance to use as the client. | | AthenaClient | *database* (producer) | The Athena database to use. | | String | *delay* (producer) | Milliseconds before the next poll for query execution status. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 2000 | long | *encryptionOption* (producer) | The encryption type to use when storing query results in S3. One of SSE_S3, SSE_KMS, or CSE_KMS. There are 4 enums and the value can be one of: SSE_S3, SSE_KMS, CSE_KMS, null | | EncryptionOption diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java index d0ab7ff..f2ae089 100644 --- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java +++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java @@ -32,8 +32,6 @@ public class Athena2ComponentConfigurer extends PropertyConfigurerSupport implem case "accessKey": getOrCreateConfiguration(target).setAccessKey(property(camelContext, java.lang.String.class, value)); return true; case "amazonathenaclient": case "amazonAthenaClient": getOrCreateConfiguration(target).setAmazonAthenaClient(property(camelContext, software.amazon.awssdk.services.athena.AthenaClient.class, value)); return true; - case "autodiscoverclient": - case "autoDiscoverClient": getOrCreateConfiguration(target).setAutoDiscoverClient(property(camelContext, boolean.class, value)); return true; case "autowiredenabled": case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true; case "clientrequesttoken": @@ -87,14 +85,17 @@ public class Athena2ComponentConfigurer extends PropertyConfigurerSupport implem } @Override + public String[] getAutowiredNames() { + return new String[]{"amazonAthenaClient"}; + } + + @Override public Class<?> getOptionType(String name, boolean ignoreCase) { switch (ignoreCase ? name.toLowerCase() : name) { case "accesskey": case "accessKey": return java.lang.String.class; case "amazonathenaclient": case "amazonAthenaClient": return software.amazon.awssdk.services.athena.AthenaClient.class; - case "autodiscoverclient": - case "autoDiscoverClient": return boolean.class; case "autowiredenabled": case "autowiredEnabled": return boolean.class; case "clientrequesttoken": @@ -155,8 +156,6 @@ public class Athena2ComponentConfigurer extends PropertyConfigurerSupport implem case "accessKey": return getOrCreateConfiguration(target).getAccessKey(); case "amazonathenaclient": case "amazonAthenaClient": return getOrCreateConfiguration(target).getAmazonAthenaClient(); - case "autodiscoverclient": - case "autoDiscoverClient": return getOrCreateConfiguration(target).isAutoDiscoverClient(); case "autowiredenabled": case "autowiredEnabled": return target.isAutowiredEnabled(); case "clientrequesttoken": diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java index 72d8b6d..448c382 100644 --- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java +++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java @@ -25,8 +25,6 @@ public class Athena2EndpointConfigurer extends PropertyConfigurerSupport impleme case "accessKey": target.getConfiguration().setAccessKey(property(camelContext, java.lang.String.class, value)); return true; case "amazonathenaclient": case "amazonAthenaClient": target.getConfiguration().setAmazonAthenaClient(property(camelContext, software.amazon.awssdk.services.athena.AthenaClient.class, value)); return true; - case "autodiscoverclient": - case "autoDiscoverClient": target.getConfiguration().setAutoDiscoverClient(property(camelContext, boolean.class, value)); return true; case "clientrequesttoken": case "clientRequestToken": target.getConfiguration().setClientRequestToken(property(camelContext, java.lang.String.class, value)); return true; case "database": target.getConfiguration().setDatabase(property(camelContext, java.lang.String.class, value)); return true; @@ -78,14 +76,17 @@ public class Athena2EndpointConfigurer extends PropertyConfigurerSupport impleme } @Override + public String[] getAutowiredNames() { + return new String[]{"amazonAthenaClient"}; + } + + @Override public Class<?> getOptionType(String name, boolean ignoreCase) { switch (ignoreCase ? name.toLowerCase() : name) { case "accesskey": case "accessKey": return java.lang.String.class; case "amazonathenaclient": case "amazonAthenaClient": return software.amazon.awssdk.services.athena.AthenaClient.class; - case "autodiscoverclient": - case "autoDiscoverClient": return boolean.class; case "clientrequesttoken": case "clientRequestToken": return java.lang.String.class; case "database": return java.lang.String.class; @@ -144,8 +145,6 @@ public class Athena2EndpointConfigurer extends PropertyConfigurerSupport impleme case "accessKey": return target.getConfiguration().getAccessKey(); case "amazonathenaclient": case "amazonAthenaClient": return target.getConfiguration().getAmazonAthenaClient(); - case "autodiscoverclient": - case "autoDiscoverClient": return target.getConfiguration().isAutoDiscoverClient(); case "clientrequesttoken": case "clientRequestToken": return target.getConfiguration().getClientRequestToken(); case "database": return target.getConfiguration().getDatabase(); diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java index 88d4e74..a25c2a9 100644 --- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java +++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java @@ -20,7 +20,7 @@ public class Athena2EndpointUriFactory extends org.apache.camel.support.componen private static final Set<String> PROPERTY_NAMES; private static final Set<String> SECRET_PROPERTY_NAMES; static { - Set<String> props = new HashSet<>(30); + Set<String> props = new HashSet<>(29); props.add("outputLocation"); props.add("workGroup"); props.add("kmsKey"); @@ -36,7 +36,6 @@ public class Athena2EndpointUriFactory extends org.apache.camel.support.componen props.add("encryptionOption"); props.add("amazonAthenaClient"); props.add("retry"); - props.add("autoDiscoverClient"); props.add("proxyProtocol"); props.add("secretKey"); props.add("resetWaitTimeoutOnRetry"); diff --git a/components/camel-aws2-athena/src/generated/resources/org/apache/camel/component/aws2/athena/aws2-athena.json b/components/camel-aws2-athena/src/generated/resources/org/apache/camel/component/aws2/athena/aws2-athena.json index b94857b..492d6ee 100644 --- a/components/camel-aws2-athena/src/generated/resources/org/apache/camel/component/aws2/athena/aws2-athena.json +++ b/components/camel-aws2-athena/src/generated/resources/org/apache/camel/component/aws2/athena/aws2-athena.json @@ -23,8 +23,7 @@ }, "componentProperties": { "accessKey": { "kind": "property", "displayName": "Access Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "Amazon AWS Access Key." }, - "amazonAthenaClient": { "kind": "property", "displayName": "Amazon Athena Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.athena.AthenaClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "The AmazonAthena instance to use as the client." }, - "autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a clien [...] + "amazonAthenaClient": { "kind": "property", "displayName": "Amazon Athena Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.athena.AthenaClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "The AmazonAthena instance to use as the client." }, "configuration": { "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws2.athena.Athena2Configuration", "deprecated": false, "autowired": false, "secret": false, "description": "The component configuration." }, "database": { "kind": "property", "displayName": "Database", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "The Athena database to use." }, "delay": { "kind": "property", "displayName": "Delay", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 2000, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "Milliseconds before the next poll for query execution status. See the section 'Waiting for Query Completion and R [...] @@ -55,9 +54,8 @@ }, "properties": { "label": { "kind": "path", "displayName": "Label", "group": "producer", "label": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "Logical name" }, - "autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover Client", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "Setting the autoDiscoverClient mechanism, if true, the component will look for a clie [...] "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "Amazon AWS Access Key." }, - "amazonAthenaClient": { "kind": "parameter", "displayName": "Amazon Athena Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.athena.AthenaClient", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "The AmazonAthena instance to use as the client." }, + "amazonAthenaClient": { "kind": "parameter", "displayName": "Amazon Athena Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.athena.AthenaClient", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "The AmazonAthena instance to use as the client." }, "database": { "kind": "parameter", "displayName": "Database", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "The Athena database to use." }, "delay": { "kind": "parameter", "displayName": "Delay", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 2000, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "Milliseconds before the next poll for query execution status. See the section 'Waiting for Query Completion and [...] "encryptionOption": { "kind": "parameter", "displayName": "Encryption Option", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.athena.model.EncryptionOption", "enum": [ "SSE_S3", "SSE_KMS", "CSE_KMS", "null" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.athena.Athena2Configuration", "configurationField": "configuration", "description": "The [...] diff --git a/components/camel-aws2-athena/src/main/docs/aws2-athena-component.adoc b/components/camel-aws2-athena/src/main/docs/aws2-athena-component.adoc index cbf0b17..5a0dc2b 100644 --- a/components/camel-aws2-athena/src/main/docs/aws2-athena-component.adoc +++ b/components/camel-aws2-athena/src/main/docs/aws2-athena-component.adoc @@ -60,7 +60,7 @@ from("direct:start") // component options: START -The AWS 2 Athena component supports 30 options, which are listed below. +The AWS 2 Athena component supports 29 options, which are listed below. @@ -68,8 +68,7 @@ The AWS 2 Athena component supports 30 options, which are listed below. |=== | Name | Description | Default | Type | *accessKey* (producer) | Amazon AWS Access Key. | | String -| *amazonAthenaClient* (producer) | The AmazonAthena instance to use as the client. | | AthenaClient -| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean +| *amazonAthenaClient* (producer) | *Autowired* The AmazonAthena instance to use as the client. | | AthenaClient | *configuration* (producer) | The component configuration. | | Athena2Configuration | *database* (producer) | The Athena database to use. | | String | *delay* (producer) | Milliseconds before the next poll for query execution status. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 2000 | long @@ -129,15 +128,14 @@ with the following path and query parameters: |=== -=== Query Parameters (29 parameters): +=== Query Parameters (28 parameters): [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean | *accessKey* (producer) | Amazon AWS Access Key. | | String -| *amazonAthenaClient* (producer) | The AmazonAthena instance to use as the client. | | AthenaClient +| *amazonAthenaClient* (producer) | *Autowired* The AmazonAthena instance to use as the client. | | AthenaClient | *database* (producer) | The Athena database to use. | | String | *delay* (producer) | Milliseconds before the next poll for query execution status. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 2000 | long | *encryptionOption* (producer) | The encryption type to use when storing query results in S3. One of SSE_S3, SSE_KMS, or CSE_KMS. There are 4 enums and the value can be one of: SSE_S3, SSE_KMS, CSE_KMS, null | | EncryptionOption diff --git a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Component.java b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Component.java index 0aa78d7..721b693 100644 --- a/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Component.java +++ b/components/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Component.java @@ -17,17 +17,14 @@ package org.apache.camel.component.aws2.athena; import java.util.Map; -import java.util.Set; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import software.amazon.awssdk.services.athena.AthenaClient; /** * For working with Amazon Athena SDK v2. diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2AthenaComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2AthenaComponentBuilderFactory.java index 8e0a870..76bf497 100644 --- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2AthenaComponentBuilderFactory.java +++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2AthenaComponentBuilderFactory.java @@ -74,21 +74,6 @@ public interface Aws2AthenaComponentBuilderFactory { return this; } /** - * Setting the autoDiscoverClient mechanism, if true, the component will - * look for a client instance in the registry automatically otherwise it - * will skip that checking. - * - * The option is a: <code>boolean</code> type. - * - * Default: true - * Group: common - */ - default Aws2AthenaComponentBuilder autoDiscoverClient( - boolean autoDiscoverClient) { - doSetProperty("autoDiscoverClient", autoDiscoverClient); - return this; - } - /** * The component configuration. * * The option is a: @@ -492,7 +477,6 @@ public interface Aws2AthenaComponentBuilderFactory { switch (name) { case "accessKey": getOrCreateConfiguration((Athena2Component) component).setAccessKey((java.lang.String) value); return true; case "amazonAthenaClient": getOrCreateConfiguration((Athena2Component) component).setAmazonAthenaClient((software.amazon.awssdk.services.athena.AthenaClient) value); return true; - case "autoDiscoverClient": getOrCreateConfiguration((Athena2Component) component).setAutoDiscoverClient((boolean) value); return true; case "configuration": ((Athena2Component) component).setConfiguration((org.apache.camel.component.aws2.athena.Athena2Configuration) value); return true; case "database": getOrCreateConfiguration((Athena2Component) component).setDatabase((java.lang.String) value); return true; case "delay": getOrCreateConfiguration((Athena2Component) component).setDelay((long) value); return true; diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java index 231db7b..2c0aa29 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java @@ -38,36 +38,6 @@ public interface Athena2EndpointBuilderFactory { return (AdvancedAthena2EndpointBuilder) this; } /** - * Setting the autoDiscoverClient mechanism, if true, the component will - * look for a client instance in the registry automatically otherwise it - * will skip that checking. - * - * The option is a: <code>boolean</code> type. - * - * Default: true - * Group: common - */ - default Athena2EndpointBuilder autoDiscoverClient( - boolean autoDiscoverClient) { - doSetProperty("autoDiscoverClient", autoDiscoverClient); - return this; - } - /** - * Setting the autoDiscoverClient mechanism, if true, the component will - * look for a client instance in the registry automatically otherwise it - * will skip that checking. - * - * The option will be converted to a <code>boolean</code> type. - * - * Default: true - * Group: common - */ - default Athena2EndpointBuilder autoDiscoverClient( - String autoDiscoverClient) { - doSetProperty("autoDiscoverClient", autoDiscoverClient); - return this; - } - /** * Amazon AWS Access Key. * * The option is a: <code>java.lang.String</code> type. diff --git a/docs/components/modules/ROOT/pages/aws2-athena-component.adoc b/docs/components/modules/ROOT/pages/aws2-athena-component.adoc index 0658b50..452a903 100644 --- a/docs/components/modules/ROOT/pages/aws2-athena-component.adoc +++ b/docs/components/modules/ROOT/pages/aws2-athena-component.adoc @@ -62,7 +62,7 @@ from("direct:start") // component options: START -The AWS 2 Athena component supports 30 options, which are listed below. +The AWS 2 Athena component supports 29 options, which are listed below. @@ -70,8 +70,7 @@ The AWS 2 Athena component supports 30 options, which are listed below. |=== | Name | Description | Default | Type | *accessKey* (producer) | Amazon AWS Access Key. | | String -| *amazonAthenaClient* (producer) | The AmazonAthena instance to use as the client. | | AthenaClient -| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean +| *amazonAthenaClient* (producer) | *Autowired* The AmazonAthena instance to use as the client. | | AthenaClient | *configuration* (producer) | The component configuration. | | Athena2Configuration | *database* (producer) | The Athena database to use. | | String | *delay* (producer) | Milliseconds before the next poll for query execution status. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 2000 | long @@ -131,15 +130,14 @@ with the following path and query parameters: |=== -=== Query Parameters (29 parameters): +=== Query Parameters (28 parameters): [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *autoDiscoverClient* (common) | Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking | true | boolean | *accessKey* (producer) | Amazon AWS Access Key. | | String -| *amazonAthenaClient* (producer) | The AmazonAthena instance to use as the client. | | AthenaClient +| *amazonAthenaClient* (producer) | *Autowired* The AmazonAthena instance to use as the client. | | AthenaClient | *database* (producer) | The Athena database to use. | | String | *delay* (producer) | Milliseconds before the next poll for query execution status. See the section 'Waiting for Query Completion and Retrying Failed Queries' to learn more. | 2000 | long | *encryptionOption* (producer) | The encryption type to use when storing query results in S3. One of SSE_S3, SSE_KMS, or CSE_KMS. There are 4 enums and the value can be one of: SSE_S3, SSE_KMS, CSE_KMS, null | | EncryptionOption
