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/15 10:37:36 UTC

[camel] 01/04: CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - listSecrets operation refactor

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 fd39c44868594ea14fbd919106fe5b28cc9d3028
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 15 11:29:07 2021 +0100

    CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - listSecrets operation refactor
---
 .../aws/secretsmanager/SecretsManagerProducer.java | 56 ++++++++++------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
index 3bed29a..43dbd5b 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
@@ -55,17 +55,17 @@ public class SecretsManagerProducer extends DefaultProducer {
     @Override
     public void process(Exchange exchange) throws Exception {
         switch (determineOperation(exchange)) {
-            case listSecrets:
-                listSecrets(getEndpoint().getSecretsManagerClient(), exchange);
-                break;
-            case createSecret:
-                createSecret(getEndpoint().getSecretsManagerClient(), exchange);
-                break;
-            case getSecret:
-                getSecret(getEndpoint().getSecretsManagerClient(), exchange);
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupported operation");
+        case listSecrets:
+            listSecrets(getEndpoint().getSecretsManagerClient(), exchange);
+            break;
+        case createSecret:
+            createSecret(getEndpoint().getSecretsManagerClient(), exchange);
+            break;
+        case getSecret:
+            getSecret(getEndpoint().getSecretsManagerClient(), exchange);
+            break;
+        default:
+            throw new IllegalArgumentException("Unsupported operation");
         }
     }
 
@@ -86,7 +86,7 @@ public class SecretsManagerProducer extends DefaultProducer {
     public String toString() {
         if (secretsManagerProducerToString == null) {
             secretsManagerProducerToString = "SecretsManagerProducer["
-                                             + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
+                    + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
         }
         return secretsManagerProducerToString;
     }
@@ -98,19 +98,12 @@ public class SecretsManagerProducer extends DefaultProducer {
 
     private void listSecrets(SecretsManagerClient secretsManagerClient, Exchange exchange)
             throws InvalidPayloadException {
+        ListSecretsRequest request = null;
+        ListSecretsResponse result;
         if (getConfiguration().isPojoRequest()) {
             Object payload = exchange.getIn().getMandatoryBody();
             if (payload instanceof ListSecretsRequest) {
-                ListSecretsResponse result;
-                try {
-                    ListSecretsRequest request = (ListSecretsRequest) payload;
-                    result = secretsManagerClient.listSecrets(request);
-                } catch (AwsServiceException ase) {
-                    LOG.trace("List Secrets command returned the error code {}", ase.awsErrorDetails().errorCode());
-                    throw ase;
-                }
-                Message message = getMessageForResponse(exchange);
-                message.setBody(result);
+                request = (ListSecretsRequest) payload;
             }
         } else {
             Builder builder = ListSecretsRequest.builder();
@@ -118,17 +111,16 @@ public class SecretsManagerProducer extends DefaultProducer {
                 int maxRes = exchange.getIn().getHeader(SecretsManagerConstants.MAX_RESULTS, Integer.class);
                 builder.maxResults(maxRes);
             }
-            ListSecretsResponse result;
-            try {
-                ListSecretsRequest request = builder.build();
-                result = secretsManagerClient.listSecrets(request);
-            } catch (AwsServiceException ase) {
-                LOG.trace("List Secrets command returned the error code {}", ase.awsErrorDetails().errorCode());
-                throw ase;
-            }
-            Message message = getMessageForResponse(exchange);
-            message.setBody(result);
+            request = builder.build();
         }
+        try {
+            result = secretsManagerClient.listSecrets(request);
+        } catch (AwsServiceException ase) {
+            LOG.trace("List Secrets command returned the error code {}", ase.awsErrorDetails().errorCode());
+            throw ase;
+        }
+        Message message = getMessageForResponse(exchange);
+        message.setBody(result);
     }
 
     private void createSecret(SecretsManagerClient secretsManagerClient, Exchange exchange)