From 155450380e4e2cc6df9021a5de7f5dfbf9ceea2d Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Tue, 11 Jun 2024 16:15:52 -0400 Subject: [PATCH] Fix weird indentation --- .../controllers/MessageController.java | 71 +++++++++---------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java index 030796407..768d9a267 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java @@ -8,8 +8,6 @@ import com.codahale.metrics.annotation.Timed; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.common.net.HttpHeaders; import com.google.protobuf.ByteString; import io.dropwizard.auth.Auth; @@ -633,40 +631,41 @@ public Response sendMultiRecipientMessage( try { CompletableFuture.allOf( - recipients.values().stream() - .flatMap(recipientData -> { - final Counter sentMessageCounter = Metrics.counter(SENT_MESSAGE_COUNTER_NAME, Tags.of( - UserAgentTagUtil.getPlatformTag(userAgent), - Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(online)), - Tag.of(SENDER_TYPE_TAG_NAME, SENDER_TYPE_UNIDENTIFIED), - Tag.of(IDENTITY_TYPE_TAG_NAME, recipientData.serviceIdentifier().identityType().name()))); - - validateContentLength(multiRecipientMessage.messageSizeForRecipient(recipientData.recipient()), true, userAgent); - - return recipientData.deviceIdToRegistrationId().keySet().stream().map( - deviceId ->CompletableFuture.runAsync( - () -> { - final Account destinationAccount = recipientData.account(); - final byte[] payload = multiRecipientMessage.messageForRecipient(recipientData.recipient()); - - // we asserted this must exist in validateCompleteDeviceList - final Device destinationDevice = destinationAccount.getDevice(deviceId).orElseThrow(); - try { - sentMessageCounter.increment(); - sendCommonPayloadMessage( - destinationAccount, destinationDevice, recipientData.serviceIdentifier(), timestamp, online, - isStory, isUrgent, payload); - } catch (NoSuchUserException e) { - // this should never happen, because we already asserted the device is present and enabled - Metrics.counter( - UNEXPECTED_MISSING_USER_COUNTER_NAME, - Tags.of("isPrimary", String.valueOf(destinationDevice.isPrimary()))).increment(); - uuids404.add(recipientData.serviceIdentifier()); - } - }, - multiRecipientMessageExecutor)); - }) - .toArray(CompletableFuture[]::new)) + recipients.values().stream() + .flatMap(recipientData -> { + final Counter sentMessageCounter = Metrics.counter(SENT_MESSAGE_COUNTER_NAME, Tags.of( + UserAgentTagUtil.getPlatformTag(userAgent), + Tag.of(EPHEMERAL_TAG_NAME, String.valueOf(online)), + Tag.of(SENDER_TYPE_TAG_NAME, SENDER_TYPE_UNIDENTIFIED), + Tag.of(IDENTITY_TYPE_TAG_NAME, recipientData.serviceIdentifier().identityType().name()))); + + validateContentLength(multiRecipientMessage.messageSizeForRecipient(recipientData.recipient()), true, userAgent); + + return recipientData.deviceIdToRegistrationId().keySet().stream().map( + deviceId -> CompletableFuture.runAsync( + () -> { + final Account destinationAccount = recipientData.account(); + final byte[] payload = multiRecipientMessage.messageForRecipient(recipientData.recipient()); + + // we asserted this must exist in validateCompleteDeviceList + final Device destinationDevice = destinationAccount.getDevice(deviceId).orElseThrow(); + try { + sentMessageCounter.increment(); + sendCommonPayloadMessage( + destinationAccount, destinationDevice, recipientData.serviceIdentifier(), timestamp, + online, + isStory, isUrgent, payload); + } catch (NoSuchUserException e) { + // this should never happen, because we already asserted the device is present and enabled + Metrics.counter( + UNEXPECTED_MISSING_USER_COUNTER_NAME, + Tags.of("isPrimary", String.valueOf(destinationDevice.isPrimary()))).increment(); + uuids404.add(recipientData.serviceIdentifier()); + } + }, + multiRecipientMessageExecutor)); + }) + .toArray(CompletableFuture[]::new)) .get(); } catch (InterruptedException e) { logger.error("interrupted while delivering multi-recipient messages", e);