Skip to content

Commit 99f961f

Browse files
maciejwalkowiakmaciejwalkowiak
authored
Fix formatting (#1295)
1 parent 18b1ea8 commit 99f961f

File tree

6 files changed

+36
-45
lines changed

6 files changed

+36
-45
lines changed

‎spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
import static org.assertj.core.api.Assertions.assertThatNoException;
2121

2222
import com.fasterxml.jackson.databind.ObjectMapper;
23-
24-
import net.bytebuddy.utility.RandomString;
25-
2623
import java.io.ByteArrayInputStream;
2724
import java.io.IOException;
2825
import java.io.InputStream;
@@ -32,6 +29,7 @@
3229
import java.time.Duration;
3330
import java.util.Base64;
3431
import java.util.List;
32+
import net.bytebuddy.utility.RandomString;
3533
import org.apache.http.HttpEntity;
3634
import org.apache.http.HttpResponse;
3735
import org.apache.http.client.methods.HttpGet;
@@ -342,7 +340,8 @@ private String calculateContentMD5(String content) {
342340
byte[] contentBytes = content.getBytes(StandardCharsets.UTF_8);
343341
byte[] mdBytes = md.digest(contentBytes);
344342
return Base64.getEncoder().encodeToString(mdBytes);
345-
} catch (Exception exception) {
343+
}
344+
catch (Exception exception) {
346345
throw new RuntimeException("Failed to calculate Content-MD5", exception);
347346
}
348347
}

‎spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/operations/SqsTemplate.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,11 @@ private Integer getDelaySeconds(Message message) {
454454
private Map<MessageSystemAttributeNameForSends, MessageSystemAttributeValue> mapMessageSystemAttributes(
455455
Message message) {
456456
return message.attributes().entrySet().stream().filter(Predicate.not(entry -> isSkipAttribute(entry.getKey())))
457-
.collect(Collectors.toMap(entry -> MessageSystemAttributeNameForSends.fromValue(entry.getKey().toString()),
458-
entry -> MessageSystemAttributeValue.builder().dataType(MessageAttributeDataTypes.STRING)
459-
.stringValue(entry.getValue()).build()));
457+
.collect(Collectors
458+
.toMap(entry -> MessageSystemAttributeNameForSends.fromValue(entry.getKey().toString()),
459+
entry -> MessageSystemAttributeValue.builder()
460+
.dataType(MessageAttributeDataTypes.STRING).stringValue(entry.getValue())
461+
.build()));
460462
}
461463

462464
private boolean isSkipAttribute(MessageSystemAttributeName name) {
@@ -605,7 +607,7 @@ private ReceiveMessageRequest doCreateReceiveMessageRequest(Duration pollTimeout
605607
.waitTimeSeconds(toInt(pollTimeout.toSeconds()));
606608
if (additionalHeaders.containsKey(SqsHeaders.SQS_VISIBILITY_TIMEOUT_HEADER)) {
607609
builder.visibilityTimeout(
608-
toInt(getValueAs(additionalHeaders, SqsHeaders.SQS_VISIBILITY_TIMEOUT_HEADER, Duration.class)
610+
toInt(getValueAs(additionalHeaders, SqsHeaders.SQS_VISIBILITY_TIMEOUT_HEADER, Duration.class)
609611
.toSeconds()));
610612
}
611613
if (additionalHeaders.containsKey(SqsHeaders.SQS_RECEIVE_REQUEST_ATTEMPT_ID_HEADER)) {

‎spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/support/converter/SnsMessageConverter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ private Object fromGenericMessages(List<GenericMessage<?>> messages, Class<?> ta
7272
Type resolvedType = getResolvedType(targetClass, conversionHint);
7373
Class<?> resolvedClazz = ResolvableType.forType(resolvedType).resolve();
7474

75-
Object hint = targetClass.isAssignableFrom(List.class) &&
76-
conversionHint instanceof MethodParameter mp ? mp.nested() : conversionHint;
75+
Object hint = targetClass.isAssignableFrom(List.class) && conversionHint instanceof MethodParameter mp
76+
? mp.nested()
77+
: conversionHint;
7778

7879
return messages.stream().map(message -> fromGenericMessage(message, resolvedClazz, hint)).toList();
7980
}

‎spring-cloud-aws-sqs/src/main/java/io/awspring/cloud/sqs/support/converter/SqsHeaderMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public Message fromHeaders(MessageHeaders headers) {
8181
}
8282
if (headers.containsKey(SqsHeaders.MessageSystemAttributes.SQS_AWS_TRACE_HEADER)) {
8383
attributes.put(MessageSystemAttributeName.AWS_TRACE_HEADER,
84-
headers.get(SqsHeaders.MessageSystemAttributes.SQS_AWS_TRACE_HEADER, String.class));
84+
headers.get(SqsHeaders.MessageSystemAttributes.SQS_AWS_TRACE_HEADER, String.class));
8585
}
8686
Map<String, MessageAttributeValue> messageAttributes = headers.entrySet().stream()
8787
.filter(entry -> !isSkipHeader(entry.getKey())).collect(Collectors.toMap(Map.Entry::getKey,

‎spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/operations/SqsTemplateTests.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,19 +1196,16 @@ void shouldPropagateTracingAsMessageSystemAttribute() {
11961196
String queue = "test-queue";
11971197
GetQueueUrlResponse urlResponse = GetQueueUrlResponse.builder().queueUrl(queue).build();
11981198
given(mockClient.getQueueUrl(any(GetQueueUrlRequest.class)))
1199-
.willReturn(CompletableFuture.completedFuture(urlResponse));
1199+
.willReturn(CompletableFuture.completedFuture(urlResponse));
12001200
mockQueueAttributes(mockClient, Map.of());
12011201
SendMessageResponse response = SendMessageResponse.builder().messageId(UUID.randomUUID().toString())
1202-
.sequenceNumber("123").build();
1202+
.sequenceNumber("123").build();
12031203
given(mockClient.sendMessage(any(SendMessageRequest.class)))
1204-
.willReturn(CompletableFuture.completedFuture(response));
1204+
.willReturn(CompletableFuture.completedFuture(response));
12051205

12061206
SqsOperations sqsOperations = SqsTemplate.newSyncTemplate(mockClient);
1207-
SendResult<Object> result = sqsOperations.send(options -> options
1208-
.queue(queue)
1209-
.header(SqsHeaders.MessageSystemAttributes.SQS_AWS_TRACE_HEADER, "abc")
1210-
.payload("test")
1211-
);
1207+
SendResult<Object> result = sqsOperations.send(options -> options.queue(queue)
1208+
.header(SqsHeaders.MessageSystemAttributes.SQS_AWS_TRACE_HEADER, "abc").payload("test"));
12121209

12131210
assertThat(result).isNotNull();
12141211

@@ -1217,9 +1214,8 @@ void shouldPropagateTracingAsMessageSystemAttribute() {
12171214
SendMessageRequest sendMessageRequest = captor.getValue();
12181215

12191216
assertThat(sendMessageRequest.messageSystemAttributes()).hasEntrySatisfying(
1220-
MessageSystemAttributeNameForSends.AWS_TRACE_HEADER,
1221-
value -> assertThat(value.stringValue()).isEqualTo("abc")
1222-
);
1217+
MessageSystemAttributeNameForSends.AWS_TRACE_HEADER,
1218+
value -> assertThat(value.stringValue()).isEqualTo("abc"));
12231219
}
12241220

12251221
}

‎spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/support/converter/SqsHeaderMapperTests.java

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
1919

20+
import io.awspring.cloud.sqs.listener.SqsHeaders;
2021
import java.math.BigDecimal;
2122
import java.util.Map;
2223
import java.util.UUID;
2324
import java.util.stream.Stream;
24-
25-
import io.awspring.cloud.sqs.listener.SqsHeaders;
2625
import org.junit.jupiter.api.Test;
2726
import org.junit.jupiter.params.ParameterizedTest;
2827
import org.junit.jupiter.params.provider.Arguments;
@@ -145,31 +144,25 @@ void shouldAddNumberMessageAttributes() {
145144
@Test
146145
void shouldCreateMessageWithSystemAttributesFromHeaders() {
147146
MessageHeaders headers = new MessageHeaders(
148-
Map.of(
149-
SqsHeaders.MessageSystemAttributes.SQS_MESSAGE_GROUP_ID_HEADER, "value1",
150-
SqsHeaders.MessageSystemAttributes.SQS_MESSAGE_DEDUPLICATION_ID_HEADER, "value2",
151-
SqsHeaders.MessageSystemAttributes.SQS_AWS_TRACE_HEADER, "value3",
152-
"customHeaderString", "customValueString",
153-
"customHeaderNumber", 42
154-
)
155-
);
147+
Map.of(SqsHeaders.MessageSystemAttributes.SQS_MESSAGE_GROUP_ID_HEADER, "value1",
148+
SqsHeaders.MessageSystemAttributes.SQS_MESSAGE_DEDUPLICATION_ID_HEADER, "value2",
149+
SqsHeaders.MessageSystemAttributes.SQS_AWS_TRACE_HEADER, "value3", "customHeaderString",
150+
"customValueString", "customHeaderNumber", 42));
156151

157152
SqsHeaderMapper mapper = new SqsHeaderMapper();
158153
Message message = mapper.fromHeaders(headers);
159154

160-
assertThat(message.attributes())
161-
.hasSize(3)
162-
.containsExactlyInAnyOrderEntriesOf(Map.of(
163-
MessageSystemAttributeName.MESSAGE_GROUP_ID, "value1",
164-
MessageSystemAttributeName.MESSAGE_DEDUPLICATION_ID, "value2",
165-
MessageSystemAttributeName.AWS_TRACE_HEADER, "value3"
166-
));
167-
assertThat(message.messageAttributes())
168-
.hasSize(2)
169-
.containsExactlyInAnyOrderEntriesOf(Map.of(
170-
"customHeaderString", MessageAttributeValue.builder().dataType(MessageAttributeDataTypes.STRING).stringValue("customValueString").build(),
171-
"customHeaderNumber", MessageAttributeValue.builder().dataType(MessageAttributeDataTypes.NUMBER + ".java.lang.Integer").stringValue("42").build()
172-
));
155+
assertThat(message.attributes()).hasSize(3)
156+
.containsExactlyInAnyOrderEntriesOf(Map.of(MessageSystemAttributeName.MESSAGE_GROUP_ID, "value1",
157+
MessageSystemAttributeName.MESSAGE_DEDUPLICATION_ID, "value2",
158+
MessageSystemAttributeName.AWS_TRACE_HEADER, "value3"));
159+
assertThat(message.messageAttributes()).hasSize(2)
160+
.containsExactlyInAnyOrderEntriesOf(Map.of("customHeaderString", MessageAttributeValue.builder()
161+
.dataType(MessageAttributeDataTypes.STRING).stringValue("customValueString").build(),
162+
"customHeaderNumber",
163+
MessageAttributeValue.builder()
164+
.dataType(MessageAttributeDataTypes.NUMBER + ".java.lang.Integer").stringValue("42")
165+
.build()));
173166
}
174167

175168
@ParameterizedTest

0 commit comments

Comments
 (0)