From 299ff1b26e3b4dddb1f60923f6e2ac920b181813 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Mon, 4 Mar 2024 00:07:57 +0100 Subject: [PATCH] Formatting (#1069) --- .../ses/SesAutoConfiguration.java | 6 ++++-- ...nagerConfigDataLoaderIntegrationTests.java | 10 +++++----- .../ses/SimpleEmailServiceJavaMailSender.java | 7 ++++--- .../ses/SimpleEmailServiceMailSender.java | 7 ++++--- .../SimpleEmailServiceJavaMailSenderTest.java | 2 +- .../ses/SimpleEmailServiceMailSenderTest.java | 6 +++--- .../BatchingAcknowledgementProcessor.java | 2 +- .../SqsAcknowledgementExecutor.java | 4 ++-- .../integration/BaseSqsIntegrationTest.java | 20 +++++++++---------- .../sqs/listener/ContainerOptionsTests.java | 1 - 10 files changed, 34 insertions(+), 31 deletions(-) diff --git a/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/ses/SesAutoConfiguration.java b/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/ses/SesAutoConfiguration.java index 6499be768..c46b4a0fe 100644 --- a/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/ses/SesAutoConfiguration.java +++ b/spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/ses/SesAutoConfiguration.java @@ -62,13 +62,15 @@ public SesClient sesClient(SesProperties properties, AwsClientBuilderConfigurer @Bean @ConditionalOnMissingClass("jakarta.mail.Session") public MailSender simpleMailSender(SesClient sesClient, SesProperties properties) { - return new SimpleEmailServiceMailSender(sesClient, properties.getSourceArn(), properties.getConfigurationSetName()); + return new SimpleEmailServiceMailSender(sesClient, properties.getSourceArn(), + properties.getConfigurationSetName()); } @Bean @ConditionalOnClass(name = "jakarta.mail.Session") public JavaMailSender javaMailSender(SesClient sesClient, SesProperties properties) { - return new SimpleEmailServiceJavaMailSender(sesClient, properties.getSourceArn(), properties.getConfigurationSetName()); + return new SimpleEmailServiceJavaMailSender(sesClient, properties.getSourceArn(), + properties.getConfigurationSetName()); } } diff --git a/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java b/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java index 01a1b89f4..b4e1ef6e6 100644 --- a/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java +++ b/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java @@ -278,11 +278,11 @@ void propertyIsNotResolvedWhenIntegrationIsDisabled() { application.setWebApplicationType(WebApplicationType.NONE); try (ConfigurableApplicationContext context = application.run( - "--spring.config.import=aws-secretsmanager:/config/spring;/config/second", - "--spring.cloud.aws.secretsmanager.enabled=false", "--spring.cloud.aws.credentials.secret-key=noop", - "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), - "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", - "--spring.cloud.aws.region.static=eu-west-1")) { + "--spring.config.import=aws-secretsmanager:/config/spring;/config/second", + "--spring.cloud.aws.secretsmanager.enabled=false", "--spring.cloud.aws.credentials.secret-key=noop", + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), + "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", + "--spring.cloud.aws.region.static=eu-west-1")) { assertThat(context.getEnvironment().getProperty("message")).isNull(); assertThat(context.getBeanProvider(SecretsManagerClient.class).getIfAvailable()).isNull(); } diff --git a/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSender.java b/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSender.java index 891abd400..fcb358688 100644 --- a/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSender.java +++ b/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSender.java @@ -82,7 +82,8 @@ public SimpleEmailServiceJavaMailSender(SesClient sesClient, @Nullable String so this(sesClient, sourceArn, null); } - public SimpleEmailServiceJavaMailSender(SesClient sesClient, @Nullable String sourceArn, @Nullable String configurationSetName) { + public SimpleEmailServiceJavaMailSender(SesClient sesClient, @Nullable String sourceArn, + @Nullable String configurationSetName) { super(sesClient, sourceArn, configurationSetName); } @@ -211,8 +212,8 @@ public void send(MimeMessage... mimeMessages) throws MailException { RawMessage rawMessage = createRawMessage(mimeMessage); SendRawEmailResponse sendRawEmailResponse = getEmailService() - .sendRawEmail(SendRawEmailRequest.builder().sourceArn(getSourceArn()) - .configurationSetName(getConfigurationSetName()).rawMessage(rawMessage).build()); + .sendRawEmail(SendRawEmailRequest.builder().sourceArn(getSourceArn()) + .configurationSetName(getConfigurationSetName()).rawMessage(rawMessage).build()); if (LOGGER.isDebugEnabled()) { LOGGER.debug("Message with id: {} successfully sent", sendRawEmailResponse.messageId()); diff --git a/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceMailSender.java b/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceMailSender.java index 222e78102..c757d575a 100644 --- a/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceMailSender.java +++ b/spring-cloud-aws-ses/src/main/java/io/awspring/cloud/ses/SimpleEmailServiceMailSender.java @@ -65,7 +65,8 @@ public SimpleEmailServiceMailSender(SesClient sesClient, @Nullable String source this(sesClient, sourceArn, null); } - public SimpleEmailServiceMailSender(SesClient sesClient, @Nullable String sourceArn, @Nullable String configurationSetName) { + public SimpleEmailServiceMailSender(SesClient sesClient, @Nullable String sourceArn, + @Nullable String configurationSetName) { this.sesClient = sesClient; this.sourceArn = sourceArn; this.configurationSetName = configurationSetName; @@ -139,8 +140,8 @@ private SendEmailRequest prepareMessage(SimpleMailMessage simpleMailMessage) { Message message = Message.builder().body(body).subject(subject).build(); SendEmailRequest.Builder emailRequestBuilder = SendEmailRequest.builder() - .destination(destinationBuilder.build()).source(simpleMailMessage.getFrom()).sourceArn(getSourceArn()) - .configurationSetName(getConfigurationSetName()).message(message); + .destination(destinationBuilder.build()).source(simpleMailMessage.getFrom()).sourceArn(getSourceArn()) + .configurationSetName(getConfigurationSetName()).message(message); if (StringUtils.hasText(simpleMailMessage.getReplyTo())) { emailRequestBuilder.replyToAddresses(simpleMailMessage.getReplyTo()); diff --git a/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSenderTest.java b/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSenderTest.java index 232be9854..372b946ae 100644 --- a/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSenderTest.java +++ b/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceJavaMailSenderTest.java @@ -168,7 +168,7 @@ void testSendMimeMessageWithConfigurationSetNameSet() throws MessagingException JavaMailSender mailSender = new SimpleEmailServiceJavaMailSender(emailService, null, "Configuration Set"); ArgumentCaptor request = ArgumentCaptor.forClass(SendRawEmailRequest.class); when(emailService.sendRawEmail(request.capture())) - .thenReturn(SendRawEmailResponse.builder().messageId("123").build()); + .thenReturn(SendRawEmailResponse.builder().messageId("123").build()); MimeMessage mimeMessage = createMimeMessage(); mailSender.send(mimeMessage); diff --git a/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceMailSenderTest.java b/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceMailSenderTest.java index 41c2cd2cc..b0fe71bac 100644 --- a/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceMailSenderTest.java +++ b/spring-cloud-aws-ses/src/test/java/io/awspring/cloud/ses/SimpleEmailServiceMailSenderTest.java @@ -70,12 +70,12 @@ void testSendSimpleMailWithMinimalProperties() { @Test void testSendSimpleMailWithConfigurationSetNameSet() { SesClient emailService = mock(SesClient.class); - SimpleEmailServiceMailSender mailSender = new SimpleEmailServiceMailSender(emailService, - null, "Configuration Set"); + SimpleEmailServiceMailSender mailSender = new SimpleEmailServiceMailSender(emailService, null, + "Configuration Set"); SimpleMailMessage simpleMailMessage = createSimpleMailMessage(); ArgumentCaptor request = ArgumentCaptor.forClass(SendEmailRequest.class); when(emailService.sendEmail(request.capture())) - .thenReturn(SendEmailResponse.builder().messageId("123").build()); + .thenReturn(SendEmailResponse.builder().messageId("123").build()); mailSender.send(simpleMailMessage); diff --git a/spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/listener/acknowledgement/BatchingAcknowledgementProcessor.java b/spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/listener/acknowledgement/BatchingAcknowledgementProcessor.java index d14795bf2..177a4c391 100644 --- a/spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/listener/acknowledgement/BatchingAcknowledgementProcessor.java +++ b/spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/listener/acknowledgement/BatchingAcknowledgementProcessor.java @@ -206,7 +206,7 @@ private void addMessageToBuffer(Message polledMessage) { this.context.lock(); try { this.acksBuffer.computeIfAbsent(this.messageGroupingFunction.apply(polledMessage), - newGroup -> new LinkedBlockingQueue<>()).add(polledMessage); + newGroup -> new LinkedBlockingQueue<>()).add(polledMessage); } finally { this.context.unlock(); diff --git a/spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/listener/acknowledgement/SqsAcknowledgementExecutor.java b/spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/listener/acknowledgement/SqsAcknowledgementExecutor.java index 5fea6ad5b..dc99d180d 100644 --- a/spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/listener/acknowledgement/SqsAcknowledgementExecutor.java +++ b/spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/listener/acknowledgement/SqsAcknowledgementExecutor.java @@ -122,8 +122,8 @@ private void logAckResult(Collection> messagesToAck, Throwable t, Sto watch.stop(); long totalTimeMillis = watch.getTotalTimeMillis(); if (totalTimeMillis > 10000) { - logger.warn("Acknowledgement operation took {}ms to finish in queue {} for messages {}", - totalTimeMillis, this.queueName, MessageHeaderUtils.getId(messagesToAck)); + logger.warn("Acknowledgement operation took {}ms to finish in queue {} for messages {}", totalTimeMillis, + this.queueName, MessageHeaderUtils.getId(messagesToAck)); } if (t != null) { logger.error("Error acknowledging in queue {} messages {} in {}ms", this.queueName, diff --git a/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java b/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java index 3e376aa90..193237f6b 100644 --- a/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java +++ b/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java @@ -95,14 +95,13 @@ protected static CompletableFuture createQueue(SqsAsyncClient client, String if (purgeQueues) { String queueUrl = v.queueUrl(); logger.debug("Purging queue {}", queueName); - return client.purgeQueue(req -> req.queueUrl(queueUrl).build()) - .thenRun(() -> { - if (waitForPurge) { - logger.info("Waiting 30000 seconds to start sending."); - sleep(30000); - logger.info("Done waiting."); - } - }); + return client.purgeQueue(req -> req.queueUrl(queueUrl).build()).thenRun(() -> { + if (waitForPurge) { + logger.info("Waiting 30000 seconds to start sending."); + sleep(30000); + logger.info("Done waiting."); + } + }); } else { logger.debug("Skipping purge for queue {}", queueName); @@ -117,10 +116,11 @@ protected static CompletableFuture createQueue(SqsAsyncClient client, String }); } - private static void sleep(int time) { + private static void sleep(int time) { try { Thread.sleep(time); - } catch (InterruptedException e) { + } + catch (InterruptedException e) { Thread.currentThread().interrupt(); throw new RuntimeException("Interrupted while sleeping"); } diff --git a/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/listener/ContainerOptionsTests.java b/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/listener/ContainerOptionsTests.java index b3985b01f..c4c3ba574 100644 --- a/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/listener/ContainerOptionsTests.java +++ b/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/listener/ContainerOptionsTests.java @@ -30,7 +30,6 @@ import org.springframework.core.task.TaskExecutor; import org.springframework.retry.backoff.BackOffPolicy; import org.springframework.retry.backoff.BackOffPolicyBuilder; - import software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName; import software.amazon.awssdk.services.sqs.model.QueueAttributeName;