From 8a63682c16d8812dabf34e7f15038704d4f396ac Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Fri, 22 Nov 2024 15:05:15 -0500 Subject: [PATCH] Drop the unused `PhoneNumberIdentifiers#getPhoneNumber` method --- .../storage/PhoneNumberIdentifiers.java | 31 ------------------- .../storage/PhoneNumberIdentifiersTest.java | 10 ------ 2 files changed, 41 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/PhoneNumberIdentifiers.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/PhoneNumberIdentifiers.java index 2a4b0f087..5eadc1c8b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/PhoneNumberIdentifiers.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/PhoneNumberIdentifiers.java @@ -11,13 +11,11 @@ import com.google.common.annotations.VisibleForTesting; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Timer; import java.util.Map; -import java.util.Optional; import java.util.UUID; import java.util.concurrent.CompletableFuture; import org.whispersystems.textsecuregcm.util.AttributeValues; import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient; import software.amazon.awssdk.services.dynamodb.model.GetItemRequest; -import software.amazon.awssdk.services.dynamodb.model.QueryRequest; import software.amazon.awssdk.services.dynamodb.model.ReturnValue; import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest; @@ -65,35 +63,6 @@ public class PhoneNumberIdentifiers { .whenComplete((ignored, throwable) -> sample.stop(GET_PNI_TIMER)); } - public CompletableFuture> getPhoneNumber(final UUID phoneNumberIdentifier) { - return dynamoDbClient.query(QueryRequest.builder() - .tableName(tableName) - .indexName(INDEX_NAME) - .keyConditionExpression("#pni = :pni") - .projectionExpression("#phone_number") - .expressionAttributeNames(Map.of( - "#phone_number", KEY_E164, - "#pni", ATTR_PHONE_NUMBER_IDENTIFIER - )) - .expressionAttributeValues(Map.of( - ":pni", AttributeValues.fromUUID(phoneNumberIdentifier) - )) - .build()) - .thenApply(response -> { - if (response.count() == 0) { - return Optional.empty(); - } - - if (response.count() > 1) { - throw new RuntimeException( - "Impossible result: more than one phone number returned for PNI: " + phoneNumberIdentifier); - } - - return Optional.ofNullable(response.items().getFirst().get(KEY_E164).s()); - }); - } - - @VisibleForTesting CompletableFuture generatePhoneNumberIdentifierIfNotExists(final String phoneNumber) { final Timer.Sample sample = Timer.start(); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/PhoneNumberIdentifiersTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/PhoneNumberIdentifiersTest.java index e0ba6d0df..814cdf6e1 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/PhoneNumberIdentifiersTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/PhoneNumberIdentifiersTest.java @@ -48,14 +48,4 @@ class PhoneNumberIdentifiersTest { assertEquals(phoneNumberIdentifiers.generatePhoneNumberIdentifierIfNotExists(number).join(), phoneNumberIdentifiers.generatePhoneNumberIdentifierIfNotExists(number).join()); } - - @Test - void getPhoneNumber() { - final String number = "+18005551234"; - - assertFalse(phoneNumberIdentifiers.getPhoneNumber(UUID.randomUUID()).join().isPresent()); - - final UUID pni = phoneNumberIdentifiers.getPhoneNumberIdentifier(number).join(); - assertEquals(Optional.of(number), phoneNumberIdentifiers.getPhoneNumber(pni).join()); - } }