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 2020/02/20 12:39:44 UTC
[camel] 06/09: CAMEL-14556 - Create an AWS-Lambda component based
on SDK v2, fixed CS
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 b8ef3fd30b54aab608d124f7572eb088ff64665c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Feb 20 13:29:45 2020 +0100
CAMEL-14556 - Create an AWS-Lambda component based on SDK v2, fixed CS
---
.../component/aws2/lambda/Lambda2Component.java | 11 ++--
.../lambda/Lambda2ComponentVerifierExtension.java | 1 -
.../aws2/lambda/Lambda2Configuration.java | 13 ++--
.../component/aws2/lambda/Lambda2Constants.java | 2 +-
.../component/aws2/lambda/Lambda2Endpoint.java | 13 ++--
.../component/aws2/lambda/Lambda2Operations.java | 22 ++-----
.../component/aws2/lambda/Lambda2Producer.java | 32 ++++-----
.../aws2/lambda/AmazonLambdaClientMock.java | 58 +++++++----------
.../lambda/LambdaComponentClientRegistryTest.java | 13 ++--
.../lambda/LambdaComponentConfigurationTest.java | 22 +++----
.../aws2/lambda/LambdaComponentSpringTest.java | 39 +++++------
.../aws2/lambda/LambdaOperationsTest.java | 2 -
.../lambda/LambdaProducerDefaultFunctionTest.java | 6 +-
.../component/aws2/lambda/LambdaProducerTest.java | 76 ++++++++++------------
.../LambdaComponentIntegrationTest.java | 7 --
15 files changed, 127 insertions(+), 190 deletions(-)
diff --git a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Component.java b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Component.java
index 07ac75f..b1fbb96 100644
--- a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Component.java
+++ b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Component.java
@@ -24,7 +24,6 @@ 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 software.amazon.awssdk.services.lambda.LambdaClient;
@Component("aws2-lambda")
@@ -36,16 +35,16 @@ public class Lambda2Component extends DefaultComponent {
private String secretKey;
@Metadata
private String region;
- @Metadata(label = "advanced")
+ @Metadata(label = "advanced")
private Lambda2Configuration configuration;
-
+
public Lambda2Component() {
this(null);
}
public Lambda2Component(CamelContext context) {
super(context);
-
+
registerExtension(new Lambda2ComponentVerifierExtension());
}
@@ -65,7 +64,7 @@ public class Lambda2Component extends DefaultComponent {
return endpoint;
}
-
+
public Lambda2Configuration getConfiguration() {
return configuration;
}
@@ -109,7 +108,7 @@ public class Lambda2Component extends DefaultComponent {
public void setRegion(String region) {
this.region = region;
}
-
+
private void checkAndSetRegistryClient(Lambda2Configuration configuration) {
Set<LambdaClient> clients = getCamelContext().getRegistry().findByType(LambdaClient.class);
if (clients.size() == 1) {
diff --git a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java
index 396f29a..225ef1b 100644
--- a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java
+++ b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentVerifierExtension.java
@@ -22,7 +22,6 @@ import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExt
import org.apache.camel.component.extension.verifier.ResultBuilder;
import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
import org.apache.camel.component.extension.verifier.ResultErrorHelper;
-
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.core.exception.SdkClientException;
diff --git a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Configuration.java b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Configuration.java
index f3195a0..d315f94 100644
--- a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Configuration.java
+++ b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Configuration.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws2.lambda;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
-
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.lambda.LambdaClient;
@@ -81,8 +80,9 @@ public class Lambda2Configuration implements Cloneable {
}
/**
- * 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()
+ * 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()
*/
public void setRegion(String region) {
this.region = region;
@@ -93,12 +93,13 @@ public class Lambda2Configuration implements Cloneable {
}
/**
- * The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction
+ * The operation to perform. It can be listFunctions, getFunction,
+ * createFunction, deleteFunction or invokeFunction
*/
public void setOperation(Lambda2Operations operation) {
this.operation = operation;
}
-
+
public Protocol getProxyProtocol() {
return proxyProtocol;
}
@@ -131,7 +132,7 @@ public class Lambda2Configuration implements Cloneable {
public void setProxyPort(Integer proxyPort) {
this.proxyPort = proxyPort;
}
-
+
// *************************************************
//
// *************************************************
diff --git a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Constants.java b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Constants.java
index 6e90d78..7b51f5d 100644
--- a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Constants.java
+++ b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Constants.java
@@ -52,4 +52,4 @@ public interface Lambda2Constants {
String FUNCTION_VERSION = "CamelAwsLambdaFunctionVersion";
String FUNCTION_ALIAS_NAME = "CamelAwsLambdaAliasFunctionName";
String FUNCTION_ALIAS_DESCRIPTION = "CamelAwsLambdaAliasFunctionDescription";
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java
index 606ee35..06f9a9e 100644
--- a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java
+++ b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java
@@ -28,7 +28,6 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.util.ObjectHelper;
-
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.http.apache.ApacheHttpClient;
@@ -38,10 +37,10 @@ import software.amazon.awssdk.services.lambda.LambdaClient;
import software.amazon.awssdk.services.lambda.LambdaClientBuilder;
/**
- * The aws-lambda is used for managing and invoking functions from Amazon Lambda.
+ * The aws-lambda is used for managing and invoking functions from Amazon
+ * Lambda.
*/
-@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-lambda", title = "AWS Lambda",
- syntax = "aws2-lambda:function", producerOnly = true, label = "cloud,computing,serverless")
+@UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-lambda", title = "AWS Lambda", syntax = "aws2-lambda:function", producerOnly = true, label = "cloud,computing,serverless")
public class Lambda2Endpoint extends DefaultEndpoint {
private LambdaClient awsLambdaClient;
@@ -83,7 +82,7 @@ public class Lambda2Endpoint extends DefaultEndpoint {
super.doStart();
awsLambdaClient = configuration.getAwsLambdaClient() != null ? configuration.getAwsLambdaClient() : createLambdaClient();
}
-
+
@Override
public void doStop() throws Exception {
if (ObjectHelper.isEmpty(configuration.getAwsLambdaClient())) {
@@ -103,8 +102,8 @@ public class Lambda2Endpoint extends DefaultEndpoint {
}
LambdaClient createLambdaClient() {
- LambdaClient client = null;
- LambdaClientBuilder clientBuilder = LambdaClient.builder();
+ LambdaClient client = null;
+ LambdaClientBuilder clientBuilder = LambdaClient.builder();
ProxyConfiguration.Builder proxyConfig = null;
ApacheHttpClient.Builder httpClientBuilder = null;
boolean isClientConfigFound = false;
diff --git a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Operations.java b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Operations.java
index 8f61204..2fe4f77 100644
--- a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Operations.java
+++ b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Operations.java
@@ -18,22 +18,8 @@ package org.apache.camel.component.aws2.lambda;
public enum Lambda2Operations {
- listFunctions,
- getFunction,
- createAlias,
- deleteAlias,
- getAlias,
- listAliases,
- createFunction,
- deleteFunction,
- invokeFunction,
- updateFunction,
- createEventSourceMapping,
- deleteEventSourceMapping,
- listEventSourceMapping,
- listTags,
- tagResource,
- untagResource,
- publishVersion,
- listVersions
+ listFunctions, getFunction, createAlias, deleteAlias, getAlias,
+ listAliases, createFunction, deleteFunction, invokeFunction, updateFunction,
+ createEventSourceMapping, deleteEventSourceMapping, listEventSourceMapping,
+ listTags, tagResource, untagResource, publishVersion, listVersions
}
diff --git a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
index 97fc9c5..82824e0 100644
--- a/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
+++ b/components/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
@@ -32,7 +31,6 @@ import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.lambda.LambdaClient;
@@ -79,8 +77,8 @@ import software.amazon.awssdk.services.lambda.model.UpdateFunctionCodeResponse;
import software.amazon.awssdk.services.lambda.model.VpcConfig;
/**
- * A Producer which sends messages to the Amazon Web Service Lambda <a
- * href="https://aws.amazon.com/lambda/">AWS Lambda</a>
+ * A Producer which sends messages to the Amazon Web Service Lambda
+ * <a href="https://aws.amazon.com/lambda/">AWS Lambda</a>
*/
public class Lambda2Producer extends DefaultProducer {
@@ -191,12 +189,11 @@ public class Lambda2Producer extends DefaultProducer {
private void invokeFunction(LambdaClient lambdaClient, Exchange exchange) {
InvokeResponse result;
try {
- InvokeRequest request = InvokeRequest.builder()
- .functionName(getEndpoint().getFunction())
- .payload(SdkBytes.fromString(exchange.getIn().getBody(String.class), Charset.defaultCharset())).build();
+ InvokeRequest request = InvokeRequest.builder().functionName(getEndpoint().getFunction())
+ .payload(SdkBytes.fromString(exchange.getIn().getBody(String.class), Charset.defaultCharset())).build();
result = lambdaClient.invoke(request);
} catch (AwsServiceException ase) {
- LOG.trace("invokeFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
+ LOG.trace("invokeFunction command returned the error code {}", ase.awsErrorDetails().errorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -207,8 +204,7 @@ public class Lambda2Producer extends DefaultProducer {
CreateFunctionResponse result;
try {
- CreateFunctionRequest.Builder request = CreateFunctionRequest.builder()
- .functionName(getEndpoint().getFunction());
+ CreateFunctionRequest.Builder request = CreateFunctionRequest.builder().functionName(getEndpoint().getFunction());
FunctionCode.Builder functionCode = FunctionCode.builder();
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(Lambda2Constants.S3_BUCKET))) {
@@ -237,8 +233,8 @@ public class Lambda2Producer extends DefaultProducer {
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)))) {
+ 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());
} else {
throw new IllegalArgumentException("At least S3 bucket/S3 key or zip file must be specified");
@@ -306,8 +302,8 @@ public class Lambda2Producer extends DefaultProducer {
request.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));
+ 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) {
@@ -333,12 +329,10 @@ public class Lambda2Producer extends DefaultProducer {
UpdateFunctionCodeResponse result;
try {
- UpdateFunctionCodeRequest.Builder request = UpdateFunctionCodeRequest.builder()
- .functionName(getEndpoint().getFunction());
-
+ UpdateFunctionCodeRequest.Builder request = UpdateFunctionCodeRequest.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)))) {
+ && (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");
}
@@ -606,7 +600,7 @@ public class Lambda2Producer extends DefaultProducer {
@Override
public Lambda2Endpoint getEndpoint() {
- return (Lambda2Endpoint) super.getEndpoint();
+ return (Lambda2Endpoint)super.getEndpoint();
}
public static Message getMessageForResponse(final Exchange exchange) {
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/AmazonLambdaClientMock.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/AmazonLambdaClientMock.java
index a52b2e7..2373913 100644
--- a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/AmazonLambdaClientMock.java
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/AmazonLambdaClientMock.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.aws2.lambda;
-import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
@@ -27,7 +26,6 @@ import java.util.Map;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.lambda.LambdaClient;
import software.amazon.awssdk.services.lambda.model.AliasConfiguration;
@@ -76,7 +74,6 @@ public class AmazonLambdaClientMock implements LambdaClient {
public AmazonLambdaClientMock() {
}
-
@Override
public CreateAliasResponse createAlias(CreateAliasRequest createAliasRequest) {
CreateAliasResponse.Builder result = CreateAliasResponse.builder();
@@ -88,7 +85,7 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public CreateEventSourceMappingResponse createEventSourceMapping(CreateEventSourceMappingRequest createEventSourceMappingRequest) {
- CreateEventSourceMappingResponse.Builder result = CreateEventSourceMappingResponse.builder();
+ CreateEventSourceMappingResponse.Builder result = CreateEventSourceMappingResponse.builder();
result.batchSize(100);
result.functionArn("arn:aws:lambda:eu-central-1:643534317684:function:" + createEventSourceMappingRequest.functionName());
result.state("Enabled");
@@ -99,7 +96,7 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public CreateFunctionResponse createFunction(CreateFunctionRequest createFunctionRequest) {
- CreateFunctionResponse.Builder result = CreateFunctionResponse.builder();
+ CreateFunctionResponse.Builder result = CreateFunctionResponse.builder();
result.functionName(createFunctionRequest.functionName());
result.deadLetterConfig(createFunctionRequest.deadLetterConfig());
@@ -125,9 +122,7 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public DeleteEventSourceMappingResponse deleteEventSourceMapping(DeleteEventSourceMappingRequest deleteEventSourceMappingRequest) {
- return DeleteEventSourceMappingResponse.builder()
- .uuid("a1239494949382882383")
- .state("Deleting").build();
+ return DeleteEventSourceMappingResponse.builder().uuid("a1239494949382882383").state("Deleting").build();
}
@Override
@@ -137,16 +132,13 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public GetAliasResponse getAlias(GetAliasRequest getAliasRequest) {
- return GetAliasResponse.builder()
- .name("alias")
- .description("an alias")
- .functionVersion("1").build();
+ return GetAliasResponse.builder().name("alias").description("an alias").functionVersion("1").build();
}
@Override
public GetFunctionResponse getFunction(GetFunctionRequest getFunctionRequest) {
- GetFunctionResponse.Builder result = GetFunctionResponse.builder();
+ GetFunctionResponse.Builder result = GetFunctionResponse.builder();
FunctionConfiguration.Builder configuration = FunctionConfiguration.builder();
configuration.functionName(getFunctionRequest.functionName());
configuration.functionArn("arn:aws:lambda:eu-central-1:643534317684:function:" + getFunctionRequest.functionName());
@@ -166,7 +158,7 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public InvokeResponse invoke(InvokeRequest invokeRequest) {
- InvokeResponse.Builder result = InvokeResponse.builder();
+ InvokeResponse.Builder result = InvokeResponse.builder();
Map<String, String> payload = new HashMap<>();
try {
@@ -183,7 +175,7 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public ListAliasesResponse listAliases(ListAliasesRequest listAliasesRequest) {
- ListAliasesResponse.Builder result = ListAliasesResponse.builder();
+ ListAliasesResponse.Builder result = ListAliasesResponse.builder();
AliasConfiguration.Builder conf = AliasConfiguration.builder();
List<AliasConfiguration> list = new ArrayList<AliasConfiguration>();
conf.name("alias");
@@ -196,7 +188,7 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public ListEventSourceMappingsResponse listEventSourceMappings(ListEventSourceMappingsRequest listEventSourceMappingsRequest) {
- ListEventSourceMappingsResponse.Builder result = ListEventSourceMappingsResponse.builder();
+ ListEventSourceMappingsResponse.Builder result = ListEventSourceMappingsResponse.builder();
List<EventSourceMappingConfiguration> confList = new ArrayList<>();
EventSourceMappingConfiguration.Builder conf = EventSourceMappingConfiguration.builder();
conf.batchSize(100);
@@ -211,7 +203,7 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public ListFunctionsResponse listFunctions() {
- ListFunctionsResponse.Builder result = ListFunctionsResponse.builder();
+ ListFunctionsResponse.Builder result = ListFunctionsResponse.builder();
Collection<FunctionConfiguration> listFunctions = new ArrayList<>();
FunctionConfiguration.Builder configuration = FunctionConfiguration.builder();
configuration.functionName("GetHelloWithName");
@@ -233,16 +225,16 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public ListTagsResponse listTags(ListTagsRequest listTagsRequest) {
- ListTagsResponse.Builder result = ListTagsResponse.builder();
- HashMap<String, String> map = new HashMap<String, String>();
- map.put("test", "lambda-tag");
+ ListTagsResponse.Builder result = ListTagsResponse.builder();
+ HashMap<String, String> map = new HashMap<String, String>();
+ map.put("test", "lambda-tag");
result.tags(map);
return result.build();
}
@Override
public ListVersionsByFunctionResponse listVersionsByFunction(ListVersionsByFunctionRequest listVersionsByFunctionRequest) {
- ListVersionsByFunctionResponse.Builder res = ListVersionsByFunctionResponse.builder();
+ ListVersionsByFunctionResponse.Builder res = ListVersionsByFunctionResponse.builder();
FunctionConfiguration.Builder conf = FunctionConfiguration.builder();
conf.version("1");
conf.functionName(listVersionsByFunctionRequest.functionName());
@@ -252,7 +244,7 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public PublishVersionResponse publishVersion(PublishVersionRequest publishVersionRequest) {
- PublishVersionResponse.Builder res = PublishVersionResponse.builder();
+ PublishVersionResponse.Builder res = PublishVersionResponse.builder();
res.functionName(publishVersionRequest.functionName());
res.description(publishVersionRequest.description());
return res.build();
@@ -270,7 +262,7 @@ public class AmazonLambdaClientMock implements LambdaClient {
@Override
public UpdateFunctionCodeResponse updateFunctionCode(UpdateFunctionCodeRequest updateFunctionCodeRequest) {
- UpdateFunctionCodeResponse.Builder result = UpdateFunctionCodeResponse.builder();
+ UpdateFunctionCodeResponse.Builder result = UpdateFunctionCodeResponse.builder();
result.functionName(updateFunctionCodeRequest.functionName());
result.functionArn("arn:aws:lambda:eu-central-1:643534317684:function:" + updateFunctionCodeRequest.functionName());
@@ -284,17 +276,15 @@ public class AmazonLambdaClientMock implements LambdaClient {
return result.build();
}
+ @Override
+ public String serviceName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public String serviceName() {
- // TODO Auto-generated method stub
- return null;
- }
-
+ @Override
+ public void close() {
+ // TODO Auto-generated method stub
- @Override
- public void close() {
- // TODO Auto-generated method stub
-
- }
+ }
}
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java
index e2a57c7..d6471be 100644
--- a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentClientRegistryTest.java
@@ -17,11 +17,8 @@
package org.apache.camel.component.aws2.lambda;
import org.apache.camel.PropertyBindingException;
-import org.apache.camel.component.aws2.lambda.Lambda2Component;
-import org.apache.camel.component.aws2.lambda.Lambda2Endpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.services.lambda.LambdaClient;
public class LambdaComponentClientRegistryTest extends CamelTestSupport {
@@ -32,17 +29,17 @@ public class LambdaComponentClientRegistryTest extends CamelTestSupport {
LambdaClient awsLambdaClient = new AmazonLambdaClientMock();
context.getRegistry().bind("awsLambdaClient", awsLambdaClient);
Lambda2Component component = context.getComponent("aws2-lambda", Lambda2Component.class);
- Lambda2Endpoint endpoint = (Lambda2Endpoint) component.createEndpoint(
- "aws2-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy");
+ Lambda2Endpoint endpoint = (Lambda2Endpoint)component
+ .createEndpoint("aws2-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy");
assertNotNull(endpoint.getConfiguration().getAwsLambdaClient());
}
-
+
@Test(expected = PropertyBindingException.class)
public void createEndpointWithMinimalKMSClientMisconfiguration() throws Exception {
Lambda2Component component = context.getComponent("aws2-lambda", Lambda2Component.class);
- Lambda2Endpoint endpoint = (Lambda2Endpoint) component.createEndpoint(
- "aws2-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy");
+ Lambda2Endpoint endpoint = (Lambda2Endpoint)component
+ .createEndpoint("aws2-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy");
}
}
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java
index 60b14a4..ce53951 100644
--- a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentConfigurationTest.java
@@ -16,11 +16,8 @@
*/
package org.apache.camel.component.aws2.lambda;
-import org.apache.camel.component.aws2.lambda.Lambda2Component;
-import org.apache.camel.component.aws2.lambda.Lambda2Endpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.lambda.LambdaClient;
@@ -32,8 +29,8 @@ public class LambdaComponentConfigurationTest extends CamelTestSupport {
LambdaClient awsLambdaClient = new AmazonLambdaClientMock();
context.getRegistry().bind("awsLambdaClient", awsLambdaClient);
Lambda2Component component = context.getComponent("aws2-lambda", Lambda2Component.class);
- Lambda2Endpoint endpoint = (Lambda2Endpoint) component.createEndpoint(
- "aws2-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy");
+ Lambda2Endpoint endpoint = (Lambda2Endpoint)component
+ .createEndpoint("aws2-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy");
assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
@@ -71,19 +68,19 @@ public class LambdaComponentConfigurationTest extends CamelTestSupport {
Lambda2Component component = context.getComponent("aws2-lambda", Lambda2Component.class);
component.createEndpoint("aws2-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient");
}
-
+
@Test
public void createEndpointWithComponentElements() throws Exception {
Lambda2Component component = context.getComponent("aws2-lambda", Lambda2Component.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
Lambda2Endpoint endpoint = (Lambda2Endpoint)component.createEndpoint("aws2-lambda://myFunction");
-
+
assertEquals("myFunction", endpoint.getFunction());
assertEquals("XXX", endpoint.getConfiguration().getAccessKey());
assertEquals("YYY", endpoint.getConfiguration().getSecretKey());
}
-
+
@Test
public void createEndpointWithComponentAndEndpointElements() throws Exception {
Lambda2Component component = context.getComponent("aws2-lambda", Lambda2Component.class);
@@ -91,21 +88,22 @@ public class LambdaComponentConfigurationTest extends CamelTestSupport {
component.setSecretKey("YYY");
component.setRegion(Region.US_WEST_1.toString());
Lambda2Endpoint endpoint = (Lambda2Endpoint)component.createEndpoint("aws2-lambda://myFunction?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1");
-
+
assertEquals("myFunction", endpoint.getFunction());
assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion());
}
-
+
@Test
public void createEndpointWithComponentEndpointElementsAndProxy() throws Exception {
Lambda2Component component = context.getComponent("aws2-lambda", Lambda2Component.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
component.setRegion(Region.US_WEST_1.toString());
- Lambda2Endpoint endpoint = (Lambda2Endpoint)component.createEndpoint("aws2-lambda://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP");
-
+ Lambda2Endpoint endpoint = (Lambda2Endpoint)component
+ .createEndpoint("aws2-lambda://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP");
+
assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion());
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java
index c9c3d49..818acf2 100644
--- a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest.java
@@ -25,13 +25,10 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
-import org.apache.camel.component.aws2.lambda.Lambda2Constants;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.lambda.model.CreateAliasResponse;
import software.amazon.awssdk.services.lambda.model.CreateEventSourceMappingResponse;
import software.amazon.awssdk.services.lambda.model.CreateFunctionResponse;
@@ -69,7 +66,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
}
});
- CreateFunctionResponse result = (CreateFunctionResponse) exchange.getMessage().getBody();
+ CreateFunctionResponse result = (CreateFunctionResponse)exchange.getMessage().getBody();
assertEquals(result.functionName(), "GetHelloWithName");
assertEquals(result.description(), "Hello with node.js on Lambda");
assertNotNull(result.functionArn());
@@ -88,7 +85,6 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
assertNotNull(exchange.getMessage().getBody(DeleteFunctionResponse.class));
}
-
@Test
public void lambdaGetFunctionTest() throws Exception {
@@ -98,11 +94,10 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
}
});
- GetFunctionResponse result = (GetFunctionResponse) exchange.getMessage().getBody();
+ GetFunctionResponse result = (GetFunctionResponse)exchange.getMessage().getBody();
assertEquals(result.configuration().functionName(), "GetHelloWithName");
}
-
@Test
public void lambdaListFunctionsTest() throws Exception {
Exchange exchange = template.send("direct:listFunctions", ExchangePattern.InOut, new Processor() {
@@ -112,12 +107,11 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
}
});
- ListFunctionsResponse result = (ListFunctionsResponse) exchange.getMessage().getBody();
+ ListFunctionsResponse result = (ListFunctionsResponse)exchange.getMessage().getBody();
assertEquals(result.functions().size(), 1);
assertEquals(result.functions().get(0).functionName(), "GetHelloWithName");
}
-
@Test
public void lambdaInvokeFunctionTest() throws Exception {
Exchange exchange = template.send("direct:invokeFunction", ExchangePattern.InOut, new Processor() {
@@ -130,7 +124,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
assertNotNull(exchange.getMessage().getBody(String.class));
assertEquals(exchange.getMessage().getBody(String.class), "{\"Hello\":\"Camel\"}");
}
-
+
@Test
public void lambdaCreateEventSourceMappingTest() throws Exception {
Exchange exchange = template.send("direct:createEventSourceMapping", ExchangePattern.InOut, new Processor() {
@@ -145,7 +139,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
CreateEventSourceMappingResponse result = exchange.getMessage().getBody(CreateEventSourceMappingResponse.class);
assertEquals(result.functionArn(), "arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
}
-
+
@Test
public void lambdaDeleteEventSourceMappingTest() throws Exception {
Exchange exchange = template.send("direct:deleteEventSourceMapping", ExchangePattern.InOut, new Processor() {
@@ -159,7 +153,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
DeleteEventSourceMappingResponse result = exchange.getMessage().getBody(DeleteEventSourceMappingResponse.class);
assertTrue(result.state().equalsIgnoreCase("Deleting"));
}
-
+
@Test
public void lambdaListEventSourceMappingTest() throws Exception {
Exchange exchange = template.send("direct:listEventSourceMapping", ExchangePattern.InOut, new Processor() {
@@ -172,7 +166,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
ListEventSourceMappingsResponse result = exchange.getMessage().getBody(ListEventSourceMappingsResponse.class);
assertEquals(result.eventSourceMappings().get(0).functionArn(), "arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
}
-
+
@Test
public void lambdaListTagsTest() throws Exception {
@@ -187,7 +181,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
ListTagsResponse result = (ListTagsResponse)exchange.getMessage().getBody();
assertEquals("lambda-tag", result.tags().get("test"));
}
-
+
@Test
public void tagResourceTest() throws Exception {
@@ -205,7 +199,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
TagResourceResponse result = (TagResourceResponse)exchange.getMessage().getBody();
assertNotNull(result);
}
-
+
@Test
public void untagResourceTest() throws Exception {
@@ -223,7 +217,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
UntagResourceResponse result = (UntagResourceResponse)exchange.getMessage().getBody();
assertNotNull(result);
}
-
+
@Test
public void publishVersionTest() throws Exception {
@@ -240,7 +234,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
assertEquals("GetHelloWithName", result.functionName());
assertEquals("This is my description", result.description());
}
-
+
@Test
public void listVersionsTest() throws Exception {
@@ -257,7 +251,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
assertEquals("GetHelloWithName", result.versions().get(0).functionName());
assertEquals("1", result.versions().get(0).version());
}
-
+
@Test
public void createAliasTest() throws Exception {
@@ -277,7 +271,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
assertEquals("alias", result.name());
assertEquals("1", result.functionVersion());
}
-
+
@Test
public void deleteAliasTest() throws Exception {
@@ -292,7 +286,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
DeleteAliasResponse result = (DeleteAliasResponse)exchange.getMessage().getBody();
assertNotNull(result);
}
-
+
@Test
public void getAliasTest() throws Exception {
@@ -310,7 +304,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
assertEquals("alias", result.name());
assertEquals("1", result.functionVersion());
}
-
+
@Test
public void listAliasesTest() throws Exception {
@@ -331,7 +325,6 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext(
- "org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest-context.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/aws2/lambda/LambdaComponentSpringTest-context.xml");
}
}
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaOperationsTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaOperationsTest.java
index 376b5f0..8c0f79f 100644
--- a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaOperationsTest.java
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaOperationsTest.java
@@ -20,8 +20,6 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import org.apache.camel.component.aws2.lambda.Lambda2Operations;
-
public class LambdaOperationsTest {
@Test
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java
index c4a6c57..839ab8b 100644
--- a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerDefaultFunctionTest.java
@@ -34,8 +34,6 @@ public class LambdaProducerDefaultFunctionTest extends CamelTestSupport {
@EndpointInject("mock:result")
private MockEndpoint mock;
-
-
@Test
public void lambdaInvokeFunctionTest() throws Exception {
Exchange exchange = template.send("direct:invokeFunction", ExchangePattern.InOut, new Processor() {
@@ -50,16 +48,14 @@ public class LambdaProducerDefaultFunctionTest extends CamelTestSupport {
assertEquals(exchange.getMessage().getBody(String.class), "{\"Hello\":\"Camel\"}");
}
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
+
from("direct:invokeFunction").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient").to("mock:result");
-
}
};
}
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java
index b5dfd25..ca51bdf 100644
--- a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaProducerTest.java
@@ -23,7 +23,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import software.amazon.awssdk.core.SdkBytes;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import software.amazon.awssdk.services.lambda.model.CreateAliasResponse;
import software.amazon.awssdk.services.lambda.model.CreateEventSourceMappingResponse;
import software.amazon.awssdk.services.lambda.model.CreateFunctionResponse;
@@ -41,17 +49,6 @@ import software.amazon.awssdk.services.lambda.model.PublishVersionResponse;
import software.amazon.awssdk.services.lambda.model.TagResourceResponse;
import software.amazon.awssdk.services.lambda.model.UntagResourceResponse;
-import org.apache.camel.BindToRegistry;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws2.lambda.Lambda2Constants;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-
public class LambdaProducerTest extends CamelTestSupport {
@BindToRegistry("awsLambdaClient")
@@ -78,7 +75,7 @@ public class LambdaProducerTest extends CamelTestSupport {
}
});
- CreateFunctionResponse result = (CreateFunctionResponse) exchange.getMessage().getBody();
+ CreateFunctionResponse result = (CreateFunctionResponse)exchange.getMessage().getBody();
assertEquals(result.functionName(), "GetHelloWithName");
assertEquals(result.description(), "Hello with node.js on Lambda");
assertNotNull(result.functionArn());
@@ -97,7 +94,6 @@ public class LambdaProducerTest extends CamelTestSupport {
assertNotNull(exchange.getMessage().getBody(DeleteFunctionResponse.class));
}
-
@Test
public void lambdaGetFunctionTest() throws Exception {
@@ -107,11 +103,10 @@ public class LambdaProducerTest extends CamelTestSupport {
}
});
- GetFunctionResponse result = (GetFunctionResponse) exchange.getMessage().getBody();
+ GetFunctionResponse result = (GetFunctionResponse)exchange.getMessage().getBody();
assertEquals(result.configuration().functionName(), "GetHelloWithName");
}
-
@Test
public void lambdaListFunctionsTest() throws Exception {
Exchange exchange = template.send("direct:listFunctions", ExchangePattern.InOut, new Processor() {
@@ -121,12 +116,11 @@ public class LambdaProducerTest extends CamelTestSupport {
}
});
- ListFunctionsResponse result = (ListFunctionsResponse) exchange.getMessage().getBody();
+ ListFunctionsResponse result = (ListFunctionsResponse)exchange.getMessage().getBody();
assertEquals(result.functions().size(), 1);
assertEquals(result.functions().get(0).functionName(), "GetHelloWithName");
}
-
@Test
public void lambdaInvokeFunctionTest() throws Exception {
Exchange exchange = template.send("direct:invokeFunction", ExchangePattern.InOut, new Processor() {
@@ -139,7 +133,7 @@ public class LambdaProducerTest extends CamelTestSupport {
assertNotNull(exchange.getMessage().getBody(String.class));
assertEquals(exchange.getMessage().getBody(String.class), "{\"Hello\":\"Camel\"}");
}
-
+
@Test
public void lambdaCreateEventSourceMappingTest() throws Exception {
Exchange exchange = template.send("direct:createEventSourceMapping", ExchangePattern.InOut, new Processor() {
@@ -154,7 +148,7 @@ public class LambdaProducerTest extends CamelTestSupport {
CreateEventSourceMappingResponse result = exchange.getMessage().getBody(CreateEventSourceMappingResponse.class);
assertEquals(result.functionArn(), "arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
}
-
+
@Test
public void lambdaDeleteEventSourceMappingTest() throws Exception {
Exchange exchange = template.send("direct:deleteEventSourceMapping", ExchangePattern.InOut, new Processor() {
@@ -168,7 +162,7 @@ public class LambdaProducerTest extends CamelTestSupport {
DeleteEventSourceMappingResponse result = exchange.getMessage().getBody(DeleteEventSourceMappingResponse.class);
assertTrue(result.state().equalsIgnoreCase("Deleting"));
}
-
+
@Test
public void lambdaListEventSourceMappingTest() throws Exception {
Exchange exchange = template.send("direct:listEventSourceMapping", ExchangePattern.InOut, new Processor() {
@@ -181,7 +175,7 @@ public class LambdaProducerTest extends CamelTestSupport {
ListEventSourceMappingsResponse result = exchange.getMessage().getBody(ListEventSourceMappingsResponse.class);
assertEquals(result.eventSourceMappings().get(0).functionArn(), "arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
}
-
+
@Test
public void lambdaListTagsTest() throws Exception {
@@ -196,7 +190,7 @@ public class LambdaProducerTest extends CamelTestSupport {
ListTagsResponse result = (ListTagsResponse)exchange.getMessage().getBody();
assertEquals("lambda-tag", result.tags().get("test"));
}
-
+
@Test
public void tagResourceTest() throws Exception {
@@ -214,7 +208,7 @@ public class LambdaProducerTest extends CamelTestSupport {
TagResourceResponse result = (TagResourceResponse)exchange.getMessage().getBody();
assertNotNull(result);
}
-
+
@Test
public void untagResourceTest() throws Exception {
@@ -232,7 +226,7 @@ public class LambdaProducerTest extends CamelTestSupport {
UntagResourceResponse result = (UntagResourceResponse)exchange.getMessage().getBody();
assertNotNull(result);
}
-
+
@Test
public void publishVersionTest() throws Exception {
@@ -249,7 +243,7 @@ public class LambdaProducerTest extends CamelTestSupport {
assertEquals("GetHelloWithName", result.functionName());
assertEquals("This is my description", result.description());
}
-
+
@Test
public void listVersionsTest() throws Exception {
@@ -266,7 +260,7 @@ public class LambdaProducerTest extends CamelTestSupport {
assertEquals("GetHelloWithName", result.versions().get(0).functionName());
assertEquals("1", result.versions().get(0).version());
}
-
+
@Test
public void createAliasTest() throws Exception {
@@ -286,7 +280,7 @@ public class LambdaProducerTest extends CamelTestSupport {
assertEquals("alias", result.name());
assertEquals("1", result.functionVersion());
}
-
+
@Test
public void deleteAliasTest() throws Exception {
@@ -301,7 +295,7 @@ public class LambdaProducerTest extends CamelTestSupport {
DeleteAliasResponse result = (DeleteAliasResponse)exchange.getMessage().getBody();
assertNotNull(result);
}
-
+
@Test
public void getAliasTest() throws Exception {
@@ -319,7 +313,7 @@ public class LambdaProducerTest extends CamelTestSupport {
assertEquals("alias", result.name());
assertEquals("1", result.functionVersion());
}
-
+
@Test
public void listAliasesTest() throws Exception {
@@ -354,29 +348,29 @@ public class LambdaProducerTest extends CamelTestSupport {
from("direct:deleteFunction").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=deleteFunction").to("mock:result");
from("direct:updateFunction").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=updateFunction").to("mock:result");
-
+
from("direct:listTags").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=listTags").to("mock:result");
-
+
from("direct:tagResource").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=tagResource").to("mock:result");
-
+
from("direct:untagResource").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=untagResource").to("mock:result");
-
+
from("direct:publishVersion").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=publishVersion").to("mock:result");
-
+
from("direct:listVersions").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=listVersions").to("mock:result");
from("direct:createEventSourceMapping").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=createEventSourceMapping").to("mock:result");
-
+
from("direct:deleteEventSourceMapping").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=deleteEventSourceMapping").to("mock:result");
-
+
from("direct:listEventSourceMapping").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=listEventSourceMapping").to("mock:result");
-
+
from("direct:createAlias").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=createAlias").to("mock:result");
-
+
from("direct:deleteAlias").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=deleteAlias").to("mock:result");
-
+
from("direct:getAlias").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=getAlias").to("mock:result");
-
+
from("direct:listAliases").to("aws2-lambda://GetHelloWithName?awsLambdaClient=#awsLambdaClient&operation=listAliases").to("mock:result");
}
};
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentIntegrationTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentIntegrationTest.java
index 7a051db..9444d54 100644
--- a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentIntegrationTest.java
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentIntegrationTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.aws2.lambda.Lambda2Constants;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
import org.junit.Test;
-
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.lambda.model.CreateFunctionResponse;
import software.amazon.awssdk.services.lambda.model.DeleteFunctionResponse;
@@ -36,7 +35,6 @@ import software.amazon.awssdk.services.lambda.model.ListFunctionsResponse;
@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
public class LambdaComponentIntegrationTest extends CamelTestSupport {
-
@Test
public void lambdaCreateFunctionTest() throws Exception {
Exchange exchange = template.send("direct:createFunction", ExchangePattern.InOut, new Processor() {
@@ -71,7 +69,6 @@ public class LambdaComponentIntegrationTest extends CamelTestSupport {
assertEquals(exchange.getMessage().getBody(ListFunctionsResponse.class).functions().size(), 3);
}
-
@Test
public void lambdaGetFunctionTest() throws Exception {
Exchange exchange = template.send("direct:getFunction", ExchangePattern.InOut, new Processor() {
@@ -88,7 +85,6 @@ public class LambdaComponentIntegrationTest extends CamelTestSupport {
}
-
@Test
public void lambdaInvokeFunctionTest() throws Exception {
Exchange exchange = template.send("direct:invokeFunction", ExchangePattern.InOut, new Processor() {
@@ -103,7 +99,6 @@ public class LambdaComponentIntegrationTest extends CamelTestSupport {
assertEquals(exchange.getMessage().getBody(String.class), "{\"Hello\":\"Camel\"}");
}
-
@Test
public void lambdaDeleteFunctionTest() throws Exception {
@@ -116,14 +111,12 @@ public class LambdaComponentIntegrationTest extends CamelTestSupport {
assertNotNull(exchange.getMessage().getBody(DeleteFunctionResponse.class));
}
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("direct:createFunction")
.to("aws2-lambda://GetHelloWithName?operation=createFunction&accessKey=xxxx&secretKey=xxxx&awsLambdaEndpoint=lambda.eu-central-1.amazonaws.com");