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 4e13df19a705646ca24a97f026157e84572083ff
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Apr 14 11:17:32 2020 +0200
CAMEL-14868 - Camel-AWS2-*: Where possible, give the possiblity to the end
user to pass an AWS Request pojo as body, aws2-kms regen
---
.../aws2/kms/KMS2ComponentConfigurer.java | 5 +++++
.../component/aws2/kms/KMS2EndpointConfigurer.java | 5 +++++
.../apache/camel/component/aws2/kms/aws2-kms.json | 2 ++
.../src/main/docs/aws2-kms-component.adoc | 6 ++++--
.../dsl/Aws2KmsComponentBuilderFactory.java | 13 ++++++++++++
.../src/generated/resources/metadata.json | 2 +-
.../endpoint/dsl/KMS2EndpointBuilderFactory.java | 24 ++++++++++++++++++++++
7 files changed, 54 insertions(+), 3 deletions(-)
diff --git
a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java
b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java
index c5e6c99..9589773 100644
---
a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java
+++
b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java
@@ -36,6 +36,8 @@ public class KMS2ComponentConfigurer extends
PropertyConfigurerSupport implement
case "lazystartproducer":
case "lazyStartProducer":
target.setLazyStartProducer(property(camelContext, boolean.class, value));
return true;
case "operation":
getOrCreateConfiguration(target).setOperation(property(camelContext,
org.apache.camel.component.aws2.kms.KMS2Operations.class, value)); return true;
+ case "pojorequest":
+ case "pojoRequest":
getOrCreateConfiguration(target).setPojoRequest(property(camelContext,
boolean.class, value)); return true;
case "proxyhost":
case "proxyHost":
getOrCreateConfiguration(target).setProxyHost(property(camelContext,
java.lang.String.class, value)); return true;
case "proxyport":
@@ -58,6 +60,7 @@ public class KMS2ComponentConfigurer extends
PropertyConfigurerSupport implement
answer.put("kmsClient",
software.amazon.awssdk.services.kms.KmsClient.class);
answer.put("lazyStartProducer", boolean.class);
answer.put("operation",
org.apache.camel.component.aws2.kms.KMS2Operations.class);
+ answer.put("pojoRequest", boolean.class);
answer.put("proxyHost", java.lang.String.class);
answer.put("proxyPort", java.lang.Integer.class);
answer.put("proxyProtocol",
software.amazon.awssdk.core.Protocol.class);
@@ -80,6 +83,8 @@ public class KMS2ComponentConfigurer extends
PropertyConfigurerSupport implement
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
case "operation": return
getOrCreateConfiguration(target).getOperation();
+ case "pojorequest":
+ case "pojoRequest": return
getOrCreateConfiguration(target).isPojoRequest();
case "proxyhost":
case "proxyHost": return
getOrCreateConfiguration(target).getProxyHost();
case "proxyport":
diff --git
a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java
b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java
index a04572a..39889ed 100644
---
a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java
+++
b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java
@@ -28,6 +28,8 @@ public class KMS2EndpointConfigurer extends
PropertyConfigurerSupport implements
case "lazystartproducer":
case "lazyStartProducer":
target.setLazyStartProducer(property(camelContext, boolean.class, value));
return true;
case "operation":
target.getConfiguration().setOperation(property(camelContext,
org.apache.camel.component.aws2.kms.KMS2Operations.class, value)); return true;
+ case "pojorequest":
+ case "pojoRequest":
target.getConfiguration().setPojoRequest(property(camelContext, boolean.class,
value)); return true;
case "proxyhost":
case "proxyHost":
target.getConfiguration().setProxyHost(property(camelContext,
java.lang.String.class, value)); return true;
case "proxyport":
@@ -50,6 +52,7 @@ public class KMS2EndpointConfigurer extends
PropertyConfigurerSupport implements
answer.put("kmsClient",
software.amazon.awssdk.services.kms.KmsClient.class);
answer.put("lazyStartProducer", boolean.class);
answer.put("operation",
org.apache.camel.component.aws2.kms.KMS2Operations.class);
+ answer.put("pojoRequest", boolean.class);
answer.put("proxyHost", java.lang.String.class);
answer.put("proxyPort", java.lang.Integer.class);
answer.put("proxyProtocol",
software.amazon.awssdk.core.Protocol.class);
@@ -72,6 +75,8 @@ public class KMS2EndpointConfigurer extends
PropertyConfigurerSupport implements
case "lazystartproducer":
case "lazyStartProducer": return target.isLazyStartProducer();
case "operation": return target.getConfiguration().getOperation();
+ case "pojorequest":
+ case "pojoRequest": return target.getConfiguration().isPojoRequest();
case "proxyhost":
case "proxyHost": return target.getConfiguration().getProxyHost();
case "proxyport":
diff --git
a/components/camel-aws2-kms/src/generated/resources/org/apache/camel/component/aws2/kms/aws2-kms.json
b/components/camel-aws2-kms/src/generated/resources/org/apache/camel/component/aws2/kms/aws2-kms.json
index 851c01b..6cd296b 100644
---
a/components/camel-aws2-kms/src/generated/resources/org/apache/camel/component/aws2/kms/aws2-kms.json
+++
b/components/camel-aws2-kms/src/generated/resources/org/apache/camel/component/aws2/kms/aws2-kms.json
@@ -25,6 +25,7 @@
"kmsClient": { "kind": "property", "displayName": "Kms Client", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"software.amazon.awssdk.services.kms.KmsClient", "deprecated": false, "secret":
false, "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"configuration", "description": "To use a existing configured AWS KMS as
client" },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the r [...]
"operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.kms.KMS2Operations", "enum": [ "listKeys",
"createKey", "disableKey", "scheduleKeyDeletion", "describeKey", "enableKey" ],
"deprecated": false, "deprecationNote": "", "secret": false,
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "descrip [...]
+ "pojoRequest": { "kind": "property", "displayName": "Pojo Request",
"group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"false", "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
KMS client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the KMS client" },
"proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "secret": false, "defaultValue": "HTTPS",
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol when instantiating the KMS client" },
@@ -38,6 +39,7 @@
"kmsClient": { "kind": "parameter", "displayName": "Kms Client", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"software.amazon.awssdk.services.kms.KmsClient", "deprecated": false, "secret":
false, "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"configuration", "description": "To use a existing configured AWS KMS as
client" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the [...]
"operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.aws2.kms.KMS2Operations", "enum": [ "listKeys",
"createKey", "disableKey", "scheduleKeyDeletion", "describeKey", "enableKey" ],
"deprecated": false, "deprecationNote": "", "secret": false,
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "descri [...]
+ "pojoRequest": { "kind": "parameter", "displayName": "Pojo Request",
"group": "producer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"false", "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
KMS client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the KMS client" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "secret": false, "defaultValue": "HTTPS",
"configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol when instantiating the KMS client" },
diff --git a/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
b/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
index 457bdb5..19d6f3b 100644
--- a/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
+++ b/components/camel-aws2-kms/src/main/docs/aws2-kms-component.adoc
@@ -38,7 +38,7 @@ You can append query options to the URI in the following
format,
// component options: START
-The AWS 2 KMS component supports 11 options, which are listed below.
+The AWS 2 KMS component supports 12 options, which are listed below.
@@ -49,6 +49,7 @@ The AWS 2 KMS component supports 11 options, which are listed
below.
| *kmsClient* (producer) | To use a existing configured AWS KMS as client | |
KmsClient
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *operation* (producer) | *Required* The operation to perform. The value can
be one of: listKeys, createKey, disableKey, scheduleKeyDeletion, describeKey,
enableKey | | KMS2Operations
+| *pojoRequest* (producer) | If we want to use a POJO request as body or not |
false | boolean
| *proxyHost* (producer) | To define a proxy host when instantiating the KMS
client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the KMS
client | | Integer
| *proxyProtocol* (producer) | To define a proxy protocol when instantiating
the KMS client. The value can be one of: HTTP, HTTPS | HTTPS | Protocol
@@ -81,7 +82,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (11 parameters):
+=== Query Parameters (12 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -90,6 +91,7 @@ with the following path and query parameters:
| *kmsClient* (producer) | To use a existing configured AWS KMS as client | |
KmsClient
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *operation* (producer) | *Required* The operation to perform. The value can
be one of: listKeys, createKey, disableKey, scheduleKeyDeletion, describeKey,
enableKey | | KMS2Operations
+| *pojoRequest* (producer) | If we want to use a POJO request as body or not |
false | boolean
| *proxyHost* (producer) | To define a proxy host when instantiating the KMS
client | | String
| *proxyPort* (producer) | To define a proxy port when instantiating the KMS
client | | Integer
| *proxyProtocol* (producer) | To define a proxy protocol when instantiating
the KMS client. The value can be one of: HTTP, HTTPS | HTTPS | Protocol
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KmsComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KmsComponentBuilderFactory.java
index 518c944..bdeda3a 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KmsComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KmsComponentBuilderFactory.java
@@ -108,6 +108,18 @@ public interface Aws2KmsComponentBuilderFactory {
return this;
}
/**
+ * If we want to use a POJO request as body or not.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: false
+ * Group: producer
+ */
+ default Aws2KmsComponentBuilder pojoRequest(boolean pojoRequest) {
+ doSetProperty("pojoRequest", pojoRequest);
+ return this;
+ }
+ /**
* To define a proxy host when instantiating the KMS client.
*
* The option is a: <code>java.lang.String</code> type.
@@ -221,6 +233,7 @@ public interface Aws2KmsComponentBuilderFactory {
case "kmsClient": getOrCreateConfiguration((KMS2Component)
component).setKmsClient((software.amazon.awssdk.services.kms.KmsClient) value);
return true;
case "lazyStartProducer": ((KMS2Component)
component).setLazyStartProducer((boolean) value); return true;
case "operation": getOrCreateConfiguration((KMS2Component)
component).setOperation((org.apache.camel.component.aws2.kms.KMS2Operations)
value); return true;
+ case "pojoRequest": getOrCreateConfiguration((KMS2Component)
component).setPojoRequest((boolean) value); return true;
case "proxyHost": getOrCreateConfiguration((KMS2Component)
component).setProxyHost((java.lang.String) value); return true;
case "proxyPort": getOrCreateConfiguration((KMS2Component)
component).setProxyPort((java.lang.Integer) value); return true;
case "proxyProtocol": getOrCreateConfiguration((KMS2Component)
component).setProxyProtocol((software.amazon.awssdk.core.Protocol) value);
return true;
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json
b/core/camel-componentdsl/src/generated/resources/metadata.json
index 7bc5774..33e30cb 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -612,7 +612,6 @@
"lenientProperties": false,
"javaType": "org.apache.camel.component.aws2.kms.KMS2Component",
"firstVersion": "3.1.0",
- "supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-aws2-kms",
"version": "3.3.0-SNAPSHOT"
@@ -2270,6 +2269,7 @@
"lenientProperties": false,
"javaType": "org.apache.camel.component.djl.DJLComponent",
"firstVersion": "3.3.0",
+ "supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-djl",
"version": "3.3.0-SNAPSHOT"
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
index bf6bcdf..b6d44bc 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
@@ -128,6 +128,30 @@ public interface KMS2EndpointBuilderFactory {
return this;
}
/**
+ * If we want to use a POJO request as body or not.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Default: false
+ * Group: producer
+ */
+ default KMS2EndpointBuilder pojoRequest(boolean pojoRequest) {
+ doSetProperty("pojoRequest", pojoRequest);
+ return this;
+ }
+ /**
+ * If we want to use a POJO request as body or not.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Default: false
+ * Group: producer
+ */
+ default KMS2EndpointBuilder pojoRequest(String pojoRequest) {
+ doSetProperty("pojoRequest", pojoRequest);
+ return this;
+ }
+ /**
* To define a proxy host when instantiating the KMS client.
*
* The option is a: <code>java.lang.String</code> type.
