You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/26 11:32:11 UTC
[camel] branch master updated: CAMEL-14330: Option is no longer
required as it has a default value
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 2e4d502 CAMEL-14330: Option is no longer required as it has a default value
2e4d502 is described below
commit 2e4d502ab06c000c29df0483261104dae990ae57
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Dec 26 12:31:48 2019 +0100
CAMEL-14330: Option is no longer required as it has a default value
---
.../src/main/docs/aws-lambda-component.adoc | 4 +-
.../component/aws/lambda/LambdaConfiguration.java | 5 +--
.../endpoint/dsl/LambdaEndpointBuilderFactory.java | 48 +++++++++++-----------
.../modules/ROOT/pages/aws-lambda-component.adoc | 4 +-
4 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc b/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc
index d6dd01f..63a317e 100644
--- a/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc
+++ b/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc
@@ -82,14 +82,14 @@ with the following path and query parameters:
|===
| Name | Description | Default | Type
| *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. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction | invokeFunction | LambdaOperations
-| *proxyProtocol* (producer) | To define a proxy protocol when instantiating the Lambda client | HTTPS | Protocol
+| *operation* (producer) | The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction | invokeFunction | LambdaOperations
| *region* (producer) | Amazon AWS Region. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | | String
| *awsLambdaClient* (advanced) | To use a existing configured AwsLambdaClient as client | | AWSLambda
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
| *proxyHost* (proxy) | To define a proxy host when instantiating the Lambda client | | String
| *proxyPort* (proxy) | To define a proxy port when instantiating the Lambda client | | Integer
+| *proxyProtocol* (proxy) | To define a proxy protocol when instantiating the Lambda client | HTTPS | Protocol
| *accessKey* (security) | Amazon AWS Access Key | | String
| *secretKey* (security) | Amazon AWS Secret Key | | String
|===
diff --git a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java
index e1ef999..db2ffd2 100644
--- a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java
+++ b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java
@@ -19,16 +19,13 @@ package org.apache.camel.component.aws.lambda;
import com.amazonaws.Protocol;
import com.amazonaws.services.lambda.AWSLambda;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
-import org.apache.camel.spi.UriPath;
@UriParams
public class LambdaConfiguration implements Cloneable {
@UriParam(defaultValue = "invokeFunction")
- @Metadata(required = true)
private LambdaOperations operation = LambdaOperations.invokeFunction;
@UriParam(label = "security", secret = true)
private String accessKey;
@@ -36,7 +33,7 @@ public class LambdaConfiguration implements Cloneable {
private String secretKey;
@UriParam(label = "producer")
private String region;
- @UriParam(enums = "HTTP,HTTPS", defaultValue = "HTTPS")
+ @UriParam(label = "proxy", enums = "HTTP,HTTPS", defaultValue = "HTTPS")
private Protocol proxyProtocol = Protocol.HTTPS;
@UriParam(label = "proxy")
private String proxyHost;
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
index e742193..daea93f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
@@ -85,7 +85,6 @@ public interface LambdaEndpointBuilderFactory {
* <code>org.apache.camel.component.aws.lambda.LambdaOperations</code>
* type.
*
- * Required: true
* Group: producer
*/
default LambdaEndpointBuilder operation(LambdaOperations operation) {
@@ -100,7 +99,6 @@ public interface LambdaEndpointBuilderFactory {
* <code>org.apache.camel.component.aws.lambda.LambdaOperations</code>
* type.
*
- * Required: true
* Group: producer
*/
default LambdaEndpointBuilder operation(String operation) {
@@ -108,29 +106,6 @@ public interface LambdaEndpointBuilderFactory {
return this;
}
/**
- * To define a proxy protocol when instantiating the Lambda client.
- *
- * The option is a: <code>com.amazonaws.Protocol</code> type.
- *
- * Group: producer
- */
- default LambdaEndpointBuilder proxyProtocol(Protocol proxyProtocol) {
- doSetProperty("proxyProtocol", proxyProtocol);
- return this;
- }
- /**
- * To define a proxy protocol when instantiating the Lambda client.
- *
- * The option will be converted to a <code>com.amazonaws.Protocol</code>
- * type.
- *
- * Group: producer
- */
- default LambdaEndpointBuilder proxyProtocol(String proxyProtocol) {
- doSetProperty("proxyProtocol", proxyProtocol);
- return this;
- }
- /**
* Amazon AWS Region. When using this parameter, the configuration will
* expect the capitalized name of the region (for example AP_EAST_1)
* You'll need to use the name Regions.EU_WEST_1.name().
@@ -178,6 +153,29 @@ public interface LambdaEndpointBuilderFactory {
return this;
}
/**
+ * To define a proxy protocol when instantiating the Lambda client.
+ *
+ * The option is a: <code>com.amazonaws.Protocol</code> type.
+ *
+ * Group: proxy
+ */
+ default LambdaEndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+ doSetProperty("proxyProtocol", proxyProtocol);
+ return this;
+ }
+ /**
+ * To define a proxy protocol when instantiating the Lambda client.
+ *
+ * The option will be converted to a <code>com.amazonaws.Protocol</code>
+ * type.
+ *
+ * Group: proxy
+ */
+ default LambdaEndpointBuilder proxyProtocol(String proxyProtocol) {
+ doSetProperty("proxyProtocol", proxyProtocol);
+ return this;
+ }
+ /**
* Amazon AWS Access Key.
*
* The option is a: <code>java.lang.String</code> type.
diff --git a/docs/components/modules/ROOT/pages/aws-lambda-component.adoc b/docs/components/modules/ROOT/pages/aws-lambda-component.adoc
index f299f59..b4d3109 100644
--- a/docs/components/modules/ROOT/pages/aws-lambda-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-lambda-component.adoc
@@ -83,14 +83,14 @@ with the following path and query parameters:
|===
| Name | Description | Default | Type
| *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. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction | | LambdaOperations
-| *proxyProtocol* (producer) | To define a proxy protocol when instantiating the Lambda client | HTTPS | Protocol
+| *operation* (producer) | The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction | invokeFunction | LambdaOperations
| *region* (producer) | Amazon AWS Region. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | | String
| *awsLambdaClient* (advanced) | To use a existing configured AwsLambdaClient as client | | AWSLambda
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
| *proxyHost* (proxy) | To define a proxy host when instantiating the Lambda client | | String
| *proxyPort* (proxy) | To define a proxy port when instantiating the Lambda client | | Integer
+| *proxyProtocol* (proxy) | To define a proxy protocol when instantiating the Lambda client | HTTPS | Protocol
| *accessKey* (security) | Amazon AWS Access Key | | String
| *secretKey* (security) | Amazon AWS Secret Key | | String
|===