You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/03/30 11:32:30 UTC
[camel] branch master updated (c4f1285 -> 57aa798)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from c4f1285 CAMEL-15410: Reverting back to old behaviour: URI encoding for query parameters should use plus sign for spaces.
new 9372b82 Camel-AWS2-Lambda: Producer operations refactoring - createFunction
new 99a8ed1 Fixed CS
new 88adade Camel-AWS2-Lambda: Producer operations refactoring - updateFunction
new 57aa798 Fixed CS
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../component/aws2/lambda/Lambda2Producer.java | 286 ++++++++++-----------
1 file changed, 132 insertions(+), 154 deletions(-)
[camel] 02/04: Fixed CS
Posted by ac...@apache.org.
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 99a8ed1113d4fdacf81329c9ad4d5e01374ae41f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 30 13:25:51 2021 +0200
Fixed CS
---
.../component/aws2/lambda/Lambda2Producer.java | 216 ++++++++++-----------
1 file changed, 108 insertions(+), 108 deletions(-)
diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
index 63f282e..23cbbbb 100644
--- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
+++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
@@ -234,139 +234,139 @@ public class Lambda2Producer extends DefaultProducer {
@SuppressWarnings("unchecked")
private void createFunction(LambdaClient lambdaClient, Exchange exchange) throws Exception {
- CreateFunctionRequest request = null;
- CreateFunctionResponse result;
+ CreateFunctionRequest request = null;
+ CreateFunctionResponse result;
if (getConfiguration().isPojoRequest()) {
request = exchange.getIn().getMandatoryBody(CreateFunctionRequest.class);
} else {
- CreateFunctionRequest.Builder builder = CreateFunctionRequest.builder();
- builder.functionName(getEndpoint().getFunction());
+ CreateFunctionRequest.Builder builder = CreateFunctionRequest.builder();
+ builder.functionName(getEndpoint().getFunction());
- FunctionCode.Builder functionCode = FunctionCode.builder();
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))) {
- String s3Bucket = exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET, String.class);
- functionCode.s3Bucket(s3Bucket);
- }
+ FunctionCode.Builder functionCode = FunctionCode.builder();
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))) {
+ String s3Bucket = exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET, String.class);
+ functionCode.s3Bucket(s3Bucket);
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY))) {
- String s3Key = exchange.getIn().getHeader(Lambda2Constants.S3_KEY, String.class);
- functionCode.s3Key(s3Key);
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY))) {
+ String s3Key = exchange.getIn().getHeader(Lambda2Constants.S3_KEY, String.class);
+ functionCode.s3Key(s3Key);
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_OBJECT_VERSION))) {
- String s3ObjectVersion = exchange.getIn().getHeader(Lambda2Constants.S3_OBJECT_VERSION, String.class);
- functionCode.s3ObjectVersion(s3ObjectVersion);
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_OBJECT_VERSION))) {
+ String s3ObjectVersion = exchange.getIn().getHeader(Lambda2Constants.S3_OBJECT_VERSION, String.class);
+ functionCode.s3ObjectVersion(s3ObjectVersion);
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.ZIP_FILE))) {
- String zipFile = exchange.getIn().getHeader(Lambda2Constants.ZIP_FILE, String.class);
- File fileLocalPath = new File(zipFile);
- try (FileInputStream inputStream = new FileInputStream(fileLocalPath)) {
- functionCode.zipFile(SdkBytes.fromInputStream(inputStream));
- }
- }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getBody())) {
- functionCode.zipFile(SdkBytes.fromByteBuffer(exchange.getIn().getBody(ByteBuffer.class)));
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.ZIP_FILE))) {
+ String zipFile = exchange.getIn().getHeader(Lambda2Constants.ZIP_FILE, String.class);
+ File fileLocalPath = new File(zipFile);
+ try (FileInputStream inputStream = new FileInputStream(fileLocalPath)) {
+ functionCode.zipFile(SdkBytes.fromInputStream(inputStream));
}
+ }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getBody())) {
+ functionCode.zipFile(SdkBytes.fromByteBuffer(exchange.getIn().getBody(ByteBuffer.class)));
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getBody())
- || (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))
- && ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY)))) {
- builder.code(functionCode.build());
- } else {
- throw new IllegalArgumentException("At least S3 bucket/S3 key or zip file must be specified");
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getBody())
+ || (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))
+ && ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY)))) {
+ builder.code(functionCode.build());
+ } else {
+ throw new IllegalArgumentException("At least S3 bucket/S3 key or zip file must be specified");
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.ROLE))) {
- builder.role(exchange.getIn().getHeader(Lambda2Constants.ROLE, String.class));
- } else {
- throw new IllegalArgumentException("Role must be specified");
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.ROLE))) {
+ builder.role(exchange.getIn().getHeader(Lambda2Constants.ROLE, String.class));
+ } else {
+ throw new IllegalArgumentException("Role must be specified");
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.RUNTIME))) {
- builder.runtime(exchange.getIn().getHeader(Lambda2Constants.RUNTIME, String.class));
- } else {
- throw new IllegalArgumentException("Runtime must be specified");
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.RUNTIME))) {
+ builder.runtime(exchange.getIn().getHeader(Lambda2Constants.RUNTIME, String.class));
+ } else {
+ throw new IllegalArgumentException("Runtime must be specified");
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.HANDLER))) {
- builder.handler(exchange.getIn().getHeader(Lambda2Constants.HANDLER, String.class));
- } else {
- throw new IllegalArgumentException("Handler must be specified");
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.HANDLER))) {
+ builder.handler(exchange.getIn().getHeader(Lambda2Constants.HANDLER, String.class));
+ } else {
+ throw new IllegalArgumentException("Handler must be specified");
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.DESCRIPTION))) {
- String description = exchange.getIn().getHeader(Lambda2Constants.DESCRIPTION, String.class);
- builder.description(description);
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.DESCRIPTION))) {
+ String description = exchange.getIn().getHeader(Lambda2Constants.DESCRIPTION, String.class);
+ builder.description(description);
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.TARGET_ARN))) {
- String targetArn = exchange.getIn().getHeader(Lambda2Constants.TARGET_ARN, String.class);
- builder.deadLetterConfig(DeadLetterConfig.builder().targetArn(targetArn).build());
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.TARGET_ARN))) {
+ String targetArn = exchange.getIn().getHeader(Lambda2Constants.TARGET_ARN, String.class);
+ builder.deadLetterConfig(DeadLetterConfig.builder().targetArn(targetArn).build());
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.MEMORY_SIZE))) {
- Integer memorySize = exchange.getIn().getHeader(Lambda2Constants.MEMORY_SIZE, Integer.class);
- builder.memorySize(memorySize);
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.MEMORY_SIZE))) {
+ Integer memorySize = exchange.getIn().getHeader(Lambda2Constants.MEMORY_SIZE, Integer.class);
+ builder.memorySize(memorySize);
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.KMS_KEY_ARN))) {
- String kmsKeyARN = exchange.getIn().getHeader(Lambda2Constants.KMS_KEY_ARN, String.class);
- builder.kmsKeyArn(kmsKeyARN);
- }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.PUBLISH))) {
- Boolean publish = exchange.getIn().getHeader(Lambda2Constants.PUBLISH, Boolean.class);
- builder.publish(publish);
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.KMS_KEY_ARN))) {
+ String kmsKeyARN = exchange.getIn().getHeader(Lambda2Constants.KMS_KEY_ARN, String.class);
+ builder.kmsKeyArn(kmsKeyARN);
+ }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.PUBLISH))) {
+ Boolean publish = exchange.getIn().getHeader(Lambda2Constants.PUBLISH, Boolean.class);
+ builder.publish(publish);
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.TIMEOUT))) {
- Integer timeout = exchange.getIn().getHeader(Lambda2Constants.TIMEOUT, Integer.class);
- builder.timeout(timeout);
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.TIMEOUT))) {
+ Integer timeout = exchange.getIn().getHeader(Lambda2Constants.TIMEOUT, Integer.class);
+ builder.timeout(timeout);
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.TRACING_CONFIG))) {
- String tracingConfigMode = exchange.getIn().getHeader(Lambda2Constants.TRACING_CONFIG, String.class);
- builder.tracingConfig(TracingConfig.builder().mode(tracingConfigMode).build());
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.TRACING_CONFIG))) {
+ String tracingConfigMode = exchange.getIn().getHeader(Lambda2Constants.TRACING_CONFIG, String.class);
+ builder.tracingConfig(TracingConfig.builder().mode(tracingConfigMode).build());
+ }
- Map<String, String> environmentVariables
- = CastUtils.cast(exchange.getIn().getHeader(Lambda2Constants.ENVIRONMENT_VARIABLES, Map.class));
- if (environmentVariables != null) {
- builder.environment(Environment.builder().variables(environmentVariables).build());
- }
+ Map<String, String> environmentVariables
+ = CastUtils.cast(exchange.getIn().getHeader(Lambda2Constants.ENVIRONMENT_VARIABLES, Map.class));
+ if (environmentVariables != null) {
+ builder.environment(Environment.builder().variables(environmentVariables).build());
+ }
- Map<String, String> tags = CastUtils.cast(exchange.getIn().getHeader(Lambda2Constants.TAGS, Map.class));
- if (tags != null) {
- builder.tags(tags);
- }
+ Map<String, String> tags = CastUtils.cast(exchange.getIn().getHeader(Lambda2Constants.TAGS, Map.class));
+ if (tags != null) {
+ builder.tags(tags);
+ }
- List<String> securityGroupIds = CastUtils.cast(exchange.getIn().getHeader(Lambda2Constants.SECURITY_GROUP_IDS,
- (Class<List<String>>) (Object) List.class));
- List<String> subnetIds = CastUtils.cast(
- exchange.getIn().getHeader(Lambda2Constants.SUBNET_IDS, (Class<List<String>>) (Object) List.class));
- if (securityGroupIds != null || subnetIds != null) {
- VpcConfig.Builder vpcConfig = VpcConfig.builder();
- if (securityGroupIds != null) {
- vpcConfig.securityGroupIds(securityGroupIds);
- }
- if (subnetIds != null) {
- vpcConfig.subnetIds(subnetIds);
- }
- builder.vpcConfig(vpcConfig.build());
+ List<String> securityGroupIds = CastUtils.cast(exchange.getIn().getHeader(Lambda2Constants.SECURITY_GROUP_IDS,
+ (Class<List<String>>) (Object) List.class));
+ List<String> subnetIds = CastUtils.cast(
+ exchange.getIn().getHeader(Lambda2Constants.SUBNET_IDS, (Class<List<String>>) (Object) List.class));
+ if (securityGroupIds != null || subnetIds != null) {
+ VpcConfig.Builder vpcConfig = VpcConfig.builder();
+ if (securityGroupIds != null) {
+ vpcConfig.securityGroupIds(securityGroupIds);
+ }
+ if (subnetIds != null) {
+ vpcConfig.subnetIds(subnetIds);
}
-
- request = builder.build();
+ builder.vpcConfig(vpcConfig.build());
+ }
+
+ request = builder.build();
}
- try {
- result = lambdaClient.createFunction(request);
+ try {
+ result = lambdaClient.createFunction(request);
- } catch (AwsServiceException ase) {
- LOG.trace("createFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
- throw ase;
- }
+ } catch (AwsServiceException ase) {
+ LOG.trace("createFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
+ throw ase;
+ }
- Message message = getMessageForResponse(exchange);
- message.setBody(result);
+ Message message = getMessageForResponse(exchange);
+ message.setBody(result);
}
private void updateFunction(LambdaClient lambdaClient, Exchange exchange) throws Exception {
[camel] 03/04: Camel-AWS2-Lambda: Producer operations refactoring -
updateFunction
Posted by ac...@apache.org.
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 88adade06e71d3c6d341883c51d5036295843de8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 30 13:29:00 2021 +0200
Camel-AWS2-Lambda: Producer operations refactoring - updateFunction
---
.../component/aws2/lambda/Lambda2Producer.java | 31 +++++++---------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
index 23cbbbb..3f3ed7c 100644
--- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
+++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
@@ -370,26 +370,13 @@ public class Lambda2Producer extends DefaultProducer {
}
private void updateFunction(LambdaClient lambdaClient, Exchange exchange) throws Exception {
+ UpdateFunctionCodeRequest request = null;
+ UpdateFunctionCodeResponse result;
if (getConfiguration().isPojoRequest()) {
- Object payload = exchange.getIn().getMandatoryBody();
- if (payload instanceof UpdateFunctionCodeRequest) {
- UpdateFunctionCodeResponse result;
- try {
- result = lambdaClient.updateFunctionCode((UpdateFunctionCodeRequest) payload);
- } catch (AwsServiceException ase) {
- LOG.trace("updateFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
- throw ase;
- }
-
- Message message = getMessageForResponse(exchange);
- message.setBody(result);
- }
+ request = exchange.getIn().getMandatoryBody(UpdateFunctionCodeRequest.class);
} else {
- UpdateFunctionCodeResponse result;
-
- try {
- UpdateFunctionCodeRequest.Builder request
- = UpdateFunctionCodeRequest.builder().functionName(getEndpoint().getFunction());
+ UpdateFunctionCodeRequest.Builder builder = UpdateFunctionCodeRequest.builder();
+ builder.functionName(getEndpoint().getFunction());
if (ObjectHelper.isEmpty(exchange.getIn().getBody())
&& (ObjectHelper.isEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))
@@ -399,10 +386,13 @@ public class Lambda2Producer extends DefaultProducer {
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.PUBLISH))) {
Boolean publish = exchange.getIn().getHeader(Lambda2Constants.PUBLISH, Boolean.class);
- request.publish(publish);
+ builder.publish(publish);
}
- result = lambdaClient.updateFunctionCode(request.build());
+ request = builder.build();
+ }
+ try {
+ result = lambdaClient.updateFunctionCode(request);
} catch (AwsServiceException ase) {
LOG.trace("updateFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
@@ -411,7 +401,6 @@ public class Lambda2Producer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
- }
}
private void createEventSourceMapping(LambdaClient lambdaClient, Exchange exchange) throws InvalidPayloadException {
[camel] 01/04: Camel-AWS2-Lambda: Producer operations refactoring -
createFunction
Posted by ac...@apache.org.
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 9372b828bc8ba00cfe0e833b17504e3da901bcdb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 30 13:22:43 2021 +0200
Camel-AWS2-Lambda: Producer operations refactoring - createFunction
---
.../component/aws2/lambda/Lambda2Producer.java | 59 +++++++++-------------
1 file changed, 24 insertions(+), 35 deletions(-)
diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
index 3360aaf..63f282e 100644
--- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
+++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
@@ -234,27 +234,13 @@ public class Lambda2Producer extends DefaultProducer {
@SuppressWarnings("unchecked")
private void createFunction(LambdaClient lambdaClient, Exchange exchange) throws Exception {
+ CreateFunctionRequest request = null;
+ CreateFunctionResponse result;
if (getConfiguration().isPojoRequest()) {
- Object payload = exchange.getIn().getMandatoryBody();
- if (payload instanceof CreateFunctionRequest) {
- CreateFunctionResponse result;
- try {
- result = lambdaClient.createFunction((CreateFunctionRequest) payload);
-
- } catch (AwsServiceException ase) {
- LOG.trace("createFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
- throw ase;
- }
-
- Message message = getMessageForResponse(exchange);
- message.setBody(result);
- }
+ request = exchange.getIn().getMandatoryBody(CreateFunctionRequest.class);
} else {
- CreateFunctionResponse result;
-
- try {
- CreateFunctionRequest.Builder request
- = CreateFunctionRequest.builder().functionName(getEndpoint().getFunction());
+ CreateFunctionRequest.Builder builder = CreateFunctionRequest.builder();
+ builder.functionName(getEndpoint().getFunction());
FunctionCode.Builder functionCode = FunctionCode.builder();
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))) {
@@ -286,72 +272,72 @@ public class Lambda2Producer extends DefaultProducer {
if (ObjectHelper.isNotEmpty(exchange.getIn().getBody())
|| (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))
&& ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY)))) {
- request.code(functionCode.build());
+ builder.code(functionCode.build());
} else {
throw new IllegalArgumentException("At least S3 bucket/S3 key or zip file must be specified");
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.ROLE))) {
- request.role(exchange.getIn().getHeader(Lambda2Constants.ROLE, String.class));
+ builder.role(exchange.getIn().getHeader(Lambda2Constants.ROLE, String.class));
} else {
throw new IllegalArgumentException("Role must be specified");
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.RUNTIME))) {
- request.runtime(exchange.getIn().getHeader(Lambda2Constants.RUNTIME, String.class));
+ builder.runtime(exchange.getIn().getHeader(Lambda2Constants.RUNTIME, String.class));
} else {
throw new IllegalArgumentException("Runtime must be specified");
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.HANDLER))) {
- request.handler(exchange.getIn().getHeader(Lambda2Constants.HANDLER, String.class));
+ builder.handler(exchange.getIn().getHeader(Lambda2Constants.HANDLER, String.class));
} else {
throw new IllegalArgumentException("Handler must be specified");
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.DESCRIPTION))) {
String description = exchange.getIn().getHeader(Lambda2Constants.DESCRIPTION, String.class);
- request.description(description);
+ builder.description(description);
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.TARGET_ARN))) {
String targetArn = exchange.getIn().getHeader(Lambda2Constants.TARGET_ARN, String.class);
- request.deadLetterConfig(DeadLetterConfig.builder().targetArn(targetArn).build());
+ builder.deadLetterConfig(DeadLetterConfig.builder().targetArn(targetArn).build());
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.MEMORY_SIZE))) {
Integer memorySize = exchange.getIn().getHeader(Lambda2Constants.MEMORY_SIZE, Integer.class);
- request.memorySize(memorySize);
+ builder.memorySize(memorySize);
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.KMS_KEY_ARN))) {
String kmsKeyARN = exchange.getIn().getHeader(Lambda2Constants.KMS_KEY_ARN, String.class);
- request.kmsKeyArn(kmsKeyARN);
+ builder.kmsKeyArn(kmsKeyARN);
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.PUBLISH))) {
Boolean publish = exchange.getIn().getHeader(Lambda2Constants.PUBLISH, Boolean.class);
- request.publish(publish);
+ builder.publish(publish);
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.TIMEOUT))) {
Integer timeout = exchange.getIn().getHeader(Lambda2Constants.TIMEOUT, Integer.class);
- request.timeout(timeout);
+ builder.timeout(timeout);
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.TRACING_CONFIG))) {
String tracingConfigMode = exchange.getIn().getHeader(Lambda2Constants.TRACING_CONFIG, String.class);
- request.tracingConfig(TracingConfig.builder().mode(tracingConfigMode).build());
+ builder.tracingConfig(TracingConfig.builder().mode(tracingConfigMode).build());
}
Map<String, String> environmentVariables
= CastUtils.cast(exchange.getIn().getHeader(Lambda2Constants.ENVIRONMENT_VARIABLES, Map.class));
if (environmentVariables != null) {
- request.environment(Environment.builder().variables(environmentVariables).build());
+ builder.environment(Environment.builder().variables(environmentVariables).build());
}
Map<String, String> tags = CastUtils.cast(exchange.getIn().getHeader(Lambda2Constants.TAGS, Map.class));
if (tags != null) {
- request.tags(tags);
+ builder.tags(tags);
}
List<String> securityGroupIds = CastUtils.cast(exchange.getIn().getHeader(Lambda2Constants.SECURITY_GROUP_IDS,
@@ -366,9 +352,13 @@ public class Lambda2Producer extends DefaultProducer {
if (subnetIds != null) {
vpcConfig.subnetIds(subnetIds);
}
- request.vpcConfig(vpcConfig.build());
+ builder.vpcConfig(vpcConfig.build());
}
- result = lambdaClient.createFunction(request.build());
+
+ request = builder.build();
+ }
+ try {
+ result = lambdaClient.createFunction(request);
} catch (AwsServiceException ase) {
LOG.trace("createFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
@@ -377,7 +367,6 @@ public class Lambda2Producer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
- }
}
private void updateFunction(LambdaClient lambdaClient, Exchange exchange) throws Exception {
[camel] 04/04: Fixed CS
Posted by ac...@apache.org.
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 57aa798988dd01ac9b9a3b81e584fee999a92981
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 30 13:31:39 2021 +0200
Fixed CS
---
.../component/aws2/lambda/Lambda2Producer.java | 42 +++++++++++-----------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
index 3f3ed7c..04c87ab 100644
--- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
+++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
@@ -370,37 +370,37 @@ public class Lambda2Producer extends DefaultProducer {
}
private void updateFunction(LambdaClient lambdaClient, Exchange exchange) throws Exception {
- UpdateFunctionCodeRequest request = null;
- UpdateFunctionCodeResponse result;
+ UpdateFunctionCodeRequest request = null;
+ UpdateFunctionCodeResponse result;
if (getConfiguration().isPojoRequest()) {
request = exchange.getIn().getMandatoryBody(UpdateFunctionCodeRequest.class);
} else {
- UpdateFunctionCodeRequest.Builder builder = UpdateFunctionCodeRequest.builder();
- builder.functionName(getEndpoint().getFunction());
+ UpdateFunctionCodeRequest.Builder builder = UpdateFunctionCodeRequest.builder();
+ builder.functionName(getEndpoint().getFunction());
- if (ObjectHelper.isEmpty(exchange.getIn().getBody())
- && (ObjectHelper.isEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))
- && ObjectHelper.isEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY)))) {
- throw new IllegalArgumentException("At least S3 bucket/S3 key or zip file must be specified");
- }
+ if (ObjectHelper.isEmpty(exchange.getIn().getBody())
+ && (ObjectHelper.isEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))
+ && ObjectHelper.isEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_KEY)))) {
+ throw new IllegalArgumentException("At least S3 bucket/S3 key or zip file must be specified");
+ }
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.PUBLISH))) {
- Boolean publish = exchange.getIn().getHeader(Lambda2Constants.PUBLISH, Boolean.class);
- builder.publish(publish);
- }
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.PUBLISH))) {
+ Boolean publish = exchange.getIn().getHeader(Lambda2Constants.PUBLISH, Boolean.class);
+ builder.publish(publish);
+ }
- request = builder.build();
+ request = builder.build();
}
try {
- result = lambdaClient.updateFunctionCode(request);
+ result = lambdaClient.updateFunctionCode(request);
- } catch (AwsServiceException ase) {
- LOG.trace("updateFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
- throw ase;
- }
+ } catch (AwsServiceException ase) {
+ LOG.trace("updateFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
+ throw ase;
+ }
- Message message = getMessageForResponse(exchange);
- message.setBody(result);
+ Message message = getMessageForResponse(exchange);
+ message.setBody(result);
}
private void createEventSourceMapping(LambdaClient lambdaClient, Exchange exchange) throws InvalidPayloadException {