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 453023ee5eca42960ebb7037e3868e59ea0b5665
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Feb 3 19:24:14 2020 +0100
CAMEL-14478 - Create an AWS-KMS component based on SDK v2, Fixed CS
---
.../camel/component/aws2/kms/KMS2Component.java | 17 +++----
.../aws2/kms/KMS2ComponentVerifierExtension.java | 9 ++--
.../component/aws2/kms/KMS2Configuration.java | 12 ++---
.../camel/component/aws2/kms/KMS2Constants.java | 10 ++--
.../camel/component/aws2/kms/KMS2Endpoint.java | 3 +-
.../camel/component/aws2/kms/KMS2Operations.java | 7 +--
.../camel/component/aws2/kms/KMS2Producer.java | 15 +++---
.../component/aws2/kms/AmazonKMSClientMock.java | 32 ++++++------
.../aws2/kms/KMSComponentClientRegistryTest.java | 4 +-
.../aws2/kms/KMSComponentConfigurationTest.java | 17 +++----
.../kms/KMSComponentVerifierExtensionTest.java | 1 -
.../component/aws2/kms/KMSProducerSpringTest.java | 35 ++++++-------
.../camel/component/aws2/kms/KMSProducerTest.java | 57 ++++++++--------------
13 files changed, 92 insertions(+), 127 deletions(-)
diff --git
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java
index 8003761..fc0c5b8 100644
---
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java
+++
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.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.kms.KmsClient;
/**
@@ -39,23 +38,23 @@ public class KMS2Component extends DefaultComponent {
private String secretKey;
@Metadata
private String region;
- @Metadata(label = "advanced")
+ @Metadata(label = "advanced")
private KMS2Configuration configuration;
-
+
public KMS2Component() {
this(null);
}
-
+
public KMS2Component(CamelContext context) {
super(context);
-
+
registerExtension(new KMS2ComponentVerifierExtension());
}
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
KMS2Configuration configuration = this.configuration != null ?
this.configuration.copy() : new KMS2Configuration();
-
+
KMS2Endpoint endpoint = new KMS2Endpoint(uri, this, configuration);
endpoint.getConfiguration().setAccessKey(accessKey);
endpoint.getConfiguration().setSecretKey(secretKey);
@@ -65,10 +64,10 @@ public class KMS2Component extends DefaultComponent {
if (configuration.getKmsClient() == null &&
(configuration.getAccessKey() == null || configuration.getSecretKey() == null))
{
throw new IllegalArgumentException("Amazon kms client or accessKey
and secretKey must be specified");
}
-
+
return endpoint;
}
-
+
public KMS2Configuration getConfiguration() {
return configuration;
}
@@ -101,7 +100,7 @@ public class KMS2Component extends DefaultComponent {
public void setSecretKey(String secretKey) {
this.secretKey = secretKey;
}
-
+
public String getRegion() {
return region;
}
diff --git
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2ComponentVerifierExtension.java
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2ComponentVerifierExtension.java
index 9c7779c..f24c88c 100644
---
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2ComponentVerifierExtension.java
+++
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2ComponentVerifierExtension.java
@@ -18,6 +18,10 @@ package org.apache.camel.component.aws2.kms;
import java.util.Map;
+import
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
+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;
@@ -25,11 +29,6 @@ import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.kms.KmsClient;
import software.amazon.awssdk.services.kms.KmsClientBuilder;
-import
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
-import org.apache.camel.component.extension.verifier.ResultBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorHelper;
-
public class KMS2ComponentVerifierExtension extends
DefaultComponentVerifierExtension {
public KMS2ComponentVerifierExtension() {
diff --git
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java
index 4663794..3c806e6 100644
---
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java
+++
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java
@@ -21,7 +21,6 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
-
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.services.kms.KmsClient;
@@ -92,7 +91,7 @@ public class KMS2Configuration implements Cloneable {
public void setOperation(KMS2Operations operation) {
this.operation = operation;
}
-
+
public Protocol getProxyProtocol() {
return proxyProtocol;
}
@@ -131,15 +130,14 @@ public class KMS2Configuration implements Cloneable {
}
/**
- * The region in which EKS client needs to work. When using this
- * parameter, the configuration will expect the lowercase name of the
- * region (for example ap-east-1) You'll need to use the name
- * Region.EU_WEST_1.id()
+ * The region in which EKS client needs to work. When using this parameter,
+ * the configuration will expect the lowercase name of the region (for
+ * example ap-east-1) You'll need to use the name Region.EU_WEST_1.id()
*/
public void setRegion(String region) {
this.region = region;
}
-
+
// *************************************************
//
// *************************************************
diff --git
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Constants.java
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Constants.java
index 6b8d494..0bd1913 100644
---
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Constants.java
+++
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Constants.java
@@ -20,9 +20,9 @@ package org.apache.camel.component.aws2.kms;
* Constants used in Camel AWS KMS module
*/
public interface KMS2Constants {
- String OPERATION = "CamelAwsKMSOperation";
- String LIMIT = "CamelAwsKMSLimit";
- String DESCRIPTION = "CamelAwsKMSDescription";
- String KEY_ID = "CamelAwsKMSKeyId";
- String PENDING_WINDOW_IN_DAYS = "CamelAwsKMSPendingWindowInDays";
+ String OPERATION = "CamelAwsKMSOperation";
+ String LIMIT = "CamelAwsKMSLimit";
+ String DESCRIPTION = "CamelAwsKMSDescription";
+ String KEY_ID = "CamelAwsKMSKeyId";
+ String PENDING_WINDOW_IN_DAYS = "CamelAwsKMSPendingWindowInDays";
}
diff --git
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java
index dfc061a..04a4dc0 100644
---
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java
+++
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java
@@ -26,7 +26,6 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.ScheduledPollEndpoint;
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;
@@ -67,7 +66,7 @@ public class KMS2Endpoint extends ScheduledPollEndpoint {
kmsClient = configuration.getKmsClient() != null ?
configuration.getKmsClient() : createKMSClient();
}
-
+
@Override
public void doStop() throws Exception {
if (ObjectHelper.isEmpty(configuration.getKmsClient())) {
diff --git
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Operations.java
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Operations.java
index cdf1205..71143aa 100644
---
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Operations.java
+++
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Operations.java
@@ -18,10 +18,5 @@ package org.apache.camel.component.aws2.kms;
public enum KMS2Operations {
- listKeys,
- createKey,
- disableKey,
- scheduleKeyDeletion,
- describeKey,
- enableKey
+ listKeys, createKey, disableKey, scheduleKeyDeletion, describeKey,
enableKey
}
diff --git
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java
index 66b0b45..d7b1f67 100644
---
a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java
+++
b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java
@@ -24,7 +24,6 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.services.kms.KmsClient;
import software.amazon.awssdk.services.kms.model.CreateKeyRequest;
@@ -125,7 +124,7 @@ public class KMS2Producer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
private void createKey(KmsClient kmsClient, Exchange exchange) {
CreateKeyRequest.Builder builder = CreateKeyRequest.builder();
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(KMS2Constants.DESCRIPTION)))
{
@@ -142,7 +141,7 @@ public class KMS2Producer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
private void disableKey(KmsClient kmsClient, Exchange exchange) {
DisableKeyRequest.Builder builder = DisableKeyRequest.builder();
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(KMS2Constants.KEY_ID))) {
@@ -161,7 +160,7 @@ public class KMS2Producer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
private void scheduleKeyDeletion(KmsClient kmsClient, Exchange exchange) {
ScheduleKeyDeletionRequest.Builder builder =
ScheduleKeyDeletionRequest.builder();
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(KMS2Constants.KEY_ID))) {
@@ -173,7 +172,7 @@ public class KMS2Producer extends DefaultProducer {
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(KMS2Constants.PENDING_WINDOW_IN_DAYS)))
{
int pendingWindows =
exchange.getIn().getHeader(KMS2Constants.PENDING_WINDOW_IN_DAYS, Integer.class);
builder.pendingWindowInDays(pendingWindows);
- }
+ }
ScheduleKeyDeletionResponse result;
try {
result = kmsClient.scheduleKeyDeletion(builder.build());
@@ -184,7 +183,7 @@ public class KMS2Producer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
private void describeKey(KmsClient kmsClient, Exchange exchange) {
DescribeKeyRequest.Builder builder = DescribeKeyRequest.builder();
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(KMS2Constants.KEY_ID))) {
@@ -203,7 +202,7 @@ public class KMS2Producer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
private void enableKey(KmsClient kmsClient, Exchange exchange) {
EnableKeyRequest.Builder builder = EnableKeyRequest.builder();
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(KMS2Constants.KEY_ID))) {
@@ -222,7 +221,7 @@ public class KMS2Producer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
public static Message getMessageForResponse(final Exchange exchange) {
if (exchange.getPattern().isOutCapable()) {
Message out = exchange.getOut();
diff --git
a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/AmazonKMSClientMock.java
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/AmazonKMSClientMock.java
index 8c30dc4..757f078 100644
---
a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/AmazonKMSClientMock.java
+++
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/AmazonKMSClientMock.java
@@ -42,7 +42,7 @@ public class AmazonKMSClientMock implements KmsClient {
@Override
public CreateKeyResponse createKey(CreateKeyRequest createKeyRequest) {
- CreateKeyResponse.Builder res = CreateKeyResponse.builder();
+ CreateKeyResponse.Builder res = CreateKeyResponse.builder();
KeyMetadata.Builder metadata = KeyMetadata.builder();
metadata.keyId("test");
metadata.enabled(true);
@@ -52,7 +52,7 @@ public class AmazonKMSClientMock implements KmsClient {
@Override
public DescribeKeyResponse describeKey(DescribeKeyRequest
describeKeyRequest) {
- DescribeKeyResponse.Builder res = DescribeKeyResponse.builder();
+ DescribeKeyResponse.Builder res = DescribeKeyResponse.builder();
KeyMetadata.Builder metadata = KeyMetadata.builder();
metadata.enabled(false);
metadata.description("MyCamelKey");
@@ -69,13 +69,13 @@ public class AmazonKMSClientMock implements KmsClient {
@Override
public EnableKeyResponse enableKey(EnableKeyRequest enableKeyRequest) {
- EnableKeyResponse res = EnableKeyResponse.builder().build();
+ EnableKeyResponse res = EnableKeyResponse.builder().build();
return res;
}
@Override
public ListKeysResponse listKeys(ListKeysRequest listKeysRequest) {
- ListKeysResponse.Builder result = ListKeysResponse.builder();
+ ListKeysResponse.Builder result = ListKeysResponse.builder();
List<KeyListEntry> keyList = new ArrayList<>();
KeyListEntry.Builder kle = KeyListEntry.builder();
kle.keyId("keyId");
@@ -86,21 +86,21 @@ public class AmazonKMSClientMock implements KmsClient {
@Override
public ScheduleKeyDeletionResponse
scheduleKeyDeletion(ScheduleKeyDeletionRequest scheduleKeyDeletionRequest) {
- ScheduleKeyDeletionResponse.Builder response =
ScheduleKeyDeletionResponse.builder();
- response.keyId("test");
+ ScheduleKeyDeletionResponse.Builder response =
ScheduleKeyDeletionResponse.builder();
+ response.keyId("test");
return response.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-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java
index 53bb551..75a506f 100644
---
a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java
+++
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentClientRegistryTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.aws2.kms;
-import org.apache.camel.component.aws2.kms.KMS2Component;
-import org.apache.camel.component.aws2.kms.KMS2Endpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -33,7 +31,7 @@ public class KMSComponentClientRegistryTest extends
CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getKmsClient());
}
-
+
@Test(expected = IllegalArgumentException.class)
public void createEndpointWithMinimalKMSClientMisconfiguration() throws
Exception {
diff --git
a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java
index 04b7663..5d9988c 100644
---
a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java
+++
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentConfigurationTest.java
@@ -16,28 +16,24 @@
*/
package org.apache.camel.component.aws2.kms;
-import org.apache.camel.component.aws2.kms.KMS2Component;
-import org.apache.camel.component.aws2.kms.KMS2Endpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
public class KMSComponentConfigurationTest extends CamelTestSupport {
-
@Test
public void createEndpointWithComponentElements() throws Exception {
KMS2Component component = context.getComponent("aws2-kms",
KMS2Component.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
KMS2Endpoint endpoint =
(KMS2Endpoint)component.createEndpoint("aws2-kms://label");
-
+
assertEquals("XXX", endpoint.getConfiguration().getAccessKey());
assertEquals("YYY", endpoint.getConfiguration().getSecretKey());
}
-
+
@Test
public void createEndpointWithComponentAndEndpointElements() throws
Exception {
KMS2Component component = context.getComponent("aws2-kms",
KMS2Component.class);
@@ -45,20 +41,21 @@ public class KMSComponentConfigurationTest extends
CamelTestSupport {
component.setSecretKey("YYY");
component.setRegion(Region.US_WEST_1.toString());
KMS2Endpoint endpoint =
(KMS2Endpoint)component.createEndpoint("aws2-kms://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1");
-
+
assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion());
}
-
+
@Test
public void createEndpointWithComponentEndpointElementsAndProxy() throws
Exception {
KMS2Component component = context.getComponent("aws2-kms",
KMS2Component.class);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
component.setRegion(Region.US_WEST_1.toString());
- KMS2Endpoint endpoint =
(KMS2Endpoint)component.createEndpoint("aws2-kms://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP");
-
+ KMS2Endpoint endpoint = (KMS2Endpoint)component
+
.createEndpoint("aws2-kms://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-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentVerifierExtensionTest.java
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentVerifierExtensionTest.java
index ae237a6..aac4761 100644
---
a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentVerifierExtensionTest.java
+++
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentVerifierExtensionTest.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.Component;
-import org.apache.camel.component.aws2.kms.KMS2Operations;
import org.apache.camel.component.extension.ComponentVerifierExtension;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Assert;
diff --git
a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java
index 26f9f77..4f2828f 100644
---
a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java
+++
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerSpringTest.java
@@ -19,23 +19,20 @@ package org.apache.camel.component.aws2.kms;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.aws2.kms.KMS2Constants;
-import org.apache.camel.component.aws2.kms.KMS2Operations;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-
import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
import software.amazon.awssdk.services.kms.model.DescribeKeyResponse;
import software.amazon.awssdk.services.kms.model.ListKeysResponse;
import software.amazon.awssdk.services.kms.model.ScheduleKeyDeletionResponse;
public class KMSProducerSpringTest extends CamelSpringTestSupport {
-
+
@EndpointInject("mock:result")
private MockEndpoint mock;
-
+
@Test
public void kmsListBrokersTest() throws Exception {
@@ -48,12 +45,12 @@ public class KMSProducerSpringTest extends
CamelSpringTestSupport {
});
assertMockEndpointsSatisfied();
-
- ListKeysResponse resultGet = (ListKeysResponse)
exchange.getIn().getBody();
+
+ ListKeysResponse resultGet =
(ListKeysResponse)exchange.getIn().getBody();
assertEquals(1, resultGet.keys().size());
assertEquals("keyId", resultGet.keys().get(0).keyId());
}
-
+
@Test
public void kmsCreateKeyTest() throws Exception {
@@ -66,12 +63,12 @@ public class KMSProducerSpringTest extends
CamelSpringTestSupport {
});
assertMockEndpointsSatisfied();
-
- CreateKeyResponse resultGet = (CreateKeyResponse)
exchange.getIn().getBody();
+
+ CreateKeyResponse resultGet =
(CreateKeyResponse)exchange.getIn().getBody();
assertEquals("test", resultGet.keyMetadata().keyId());
assertEquals(true, resultGet.keyMetadata().enabled());
}
-
+
@Test
public void kmsDisableKeyTest() throws Exception {
@@ -85,9 +82,9 @@ public class KMSProducerSpringTest extends
CamelSpringTestSupport {
});
assertMockEndpointsSatisfied();
-
+
}
-
+
@Test
public void kmsEnableKeyTest() throws Exception {
@@ -101,9 +98,9 @@ public class KMSProducerSpringTest extends
CamelSpringTestSupport {
});
assertMockEndpointsSatisfied();
-
+
}
-
+
@Test
public void kmsScheduleKeyDeletionTest() throws Exception {
@@ -117,11 +114,11 @@ public class KMSProducerSpringTest extends
CamelSpringTestSupport {
});
assertMockEndpointsSatisfied();
-
- ScheduleKeyDeletionResponse resultGet = (ScheduleKeyDeletionResponse)
exchange.getIn().getBody();
+
+ ScheduleKeyDeletionResponse resultGet =
(ScheduleKeyDeletionResponse)exchange.getIn().getBody();
assertEquals("test", resultGet.keyId());
}
-
+
@Test
public void kmsDescribeKeyTest() throws Exception {
@@ -135,7 +132,7 @@ public class KMSProducerSpringTest extends
CamelSpringTestSupport {
});
assertMockEndpointsSatisfied();
-
+
DescribeKeyResponse resultGet =
exchange.getIn().getBody(DescribeKeyResponse.class);
assertEquals("test", resultGet.keyMetadata().keyId());
assertEquals("MyCamelKey", resultGet.keyMetadata().description());
diff --git
a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java
index 9096c0a..41a720b 100644
---
a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java
+++
b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSProducerTest.java
@@ -21,12 +21,9 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws2.kms.KMS2Constants;
-import org.apache.camel.component.aws2.kms.KMS2Operations;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
import software.amazon.awssdk.services.kms.model.DescribeKeyResponse;
import software.amazon.awssdk.services.kms.model.ListKeysResponse;
@@ -39,7 +36,7 @@ public class KMSProducerTest extends CamelTestSupport {
@EndpointInject("mock:result")
private MockEndpoint mock;
-
+
@Test
public void kmsListBrokersTest() throws Exception {
@@ -52,12 +49,12 @@ public class KMSProducerTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
- ListKeysResponse resultGet = (ListKeysResponse)
exchange.getIn().getBody();
+
+ ListKeysResponse resultGet =
(ListKeysResponse)exchange.getIn().getBody();
assertEquals(1, resultGet.keys().size());
assertEquals("keyId", resultGet.keys().get(0).keyId());
}
-
+
@Test
public void kmsCreateKeyTest() throws Exception {
@@ -70,12 +67,12 @@ public class KMSProducerTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
- CreateKeyResponse resultGet = (CreateKeyResponse)
exchange.getIn().getBody();
+
+ CreateKeyResponse resultGet =
(CreateKeyResponse)exchange.getIn().getBody();
assertEquals("test", resultGet.keyMetadata().keyId());
assertEquals(true, resultGet.keyMetadata().enabled());
}
-
+
@Test
public void kmsDisableKeyTest() throws Exception {
@@ -89,9 +86,9 @@ public class KMSProducerTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
+
}
-
+
@Test
public void kmsEnableKeyTest() throws Exception {
@@ -105,9 +102,9 @@ public class KMSProducerTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
+
}
-
+
@Test
public void kmsScheduleKeyDeletionTest() throws Exception {
@@ -121,11 +118,11 @@ public class KMSProducerTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
- ScheduleKeyDeletionResponse resultGet = (ScheduleKeyDeletionResponse)
exchange.getIn().getBody();
+
+ ScheduleKeyDeletionResponse resultGet =
(ScheduleKeyDeletionResponse)exchange.getIn().getBody();
assertEquals("test", resultGet.keyId());
}
-
+
@Test
public void kmsDescribeKeyTest() throws Exception {
@@ -139,7 +136,7 @@ public class KMSProducerTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
+
DescribeKeyResponse resultGet =
exchange.getIn().getBody(DescribeKeyResponse.class);
assertEquals("test", resultGet.keyMetadata().keyId());
assertEquals("MyCamelKey", resultGet.keyMetadata().description());
@@ -151,24 +148,12 @@ public class KMSProducerTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:listKeys")
-
.to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=listKeys")
- .to("mock:result");
- from("direct:createKey")
-
.to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=createKey")
- .to("mock:result");
- from("direct:disableKey")
-
.to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=disableKey")
- .to("mock:result");
- from("direct:enableKey")
-
.to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=enableKey")
- .to("mock:result");
- from("direct:scheduleDelete")
-
.to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=scheduleKeyDeletion")
- .to("mock:result");
- from("direct:describeKey")
-
.to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=describeKey")
- .to("mock:result");
+
from("direct:listKeys").to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=listKeys").to("mock:result");
+
from("direct:createKey").to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=createKey").to("mock:result");
+
from("direct:disableKey").to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=disableKey").to("mock:result");
+
from("direct:enableKey").to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=enableKey").to("mock:result");
+
from("direct:scheduleDelete").to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=scheduleKeyDeletion").to("mock:result");
+
from("direct:describeKey").to("aws2-kms://test?kmsClient=#amazonKmsClient&operation=describeKey").to("mock:result");
}
};
}
