From 3ba7ba4f922508dc8bd4d6473bc910815895657b Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Mon, 25 Nov 2024 14:55:55 -0500
Subject: [PATCH] Remove abstract base class from
 `RegistrationRecoveryPasswords`

---
 .../org/signal/integration/IntegrationTools.java    |  5 +----
 .../textsecuregcm/WhisperServerService.java         |  5 ++---
 .../storage/RegistrationRecoveryPasswords.java      | 13 +------------
 .../textsecuregcm/workers/CommandDependencies.java  |  5 ++---
 .../storage/RegistrationRecoveryTest.java           |  1 -
 5 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/integration-tests/src/main/java/org/signal/integration/IntegrationTools.java b/integration-tests/src/main/java/org/signal/integration/IntegrationTools.java
index c8ee2a637..25eeb173b 100644
--- a/integration-tests/src/main/java/org/signal/integration/IntegrationTools.java
+++ b/integration-tests/src/main/java/org/signal/integration/IntegrationTools.java
@@ -35,14 +35,11 @@ public class IntegrationTools {
     final DynamoDbAsyncClient dynamoDbAsyncClient =
         config.dynamoDbClient().buildAsyncClient(credentialsProvider, new NoopAwsSdkMetricPublisher());
 
-    final DynamoDbClient dynamoDbClient =
-        config.dynamoDbClient().buildSyncClient(credentialsProvider, new NoopAwsSdkMetricPublisher());
-
     final PhoneNumberIdentifiers phoneNumberIdentifiers =
         new PhoneNumberIdentifiers(dynamoDbAsyncClient, config.dynamoDbTables().phoneNumberIdentifiers());
 
     final RegistrationRecoveryPasswords registrationRecoveryPasswords = new RegistrationRecoveryPasswords(
-        config.dynamoDbTables().registrationRecovery(), Duration.ofDays(1), dynamoDbClient, dynamoDbAsyncClient);
+        config.dynamoDbTables().registrationRecovery(), Duration.ofDays(1), dynamoDbAsyncClient, Clock.systemUTC());
 
     final VerificationSessions verificationSessions = new VerificationSessions(
         dynamoDbAsyncClient, config.dynamoDbTables().verificationSessions(), Clock.systemUTC());
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index b7700c8f3..30a1f0ddd 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -432,9 +432,8 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     RegistrationRecoveryPasswords registrationRecoveryPasswords = new RegistrationRecoveryPasswords(
         config.getDynamoDbTables().getRegistrationRecovery().getTableName(),
         config.getDynamoDbTables().getRegistrationRecovery().getExpiration(),
-        dynamoDbClient,
-        dynamoDbAsyncClient
-    );
+        dynamoDbAsyncClient,
+        clock);
     ClientPublicKeys clientPublicKeys =
         new ClientPublicKeys(dynamoDbAsyncClient, config.getDynamoDbTables().getClientPublicKeys().getTableName());
 
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RegistrationRecoveryPasswords.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RegistrationRecoveryPasswords.java
index f98220c07..fd1dbb3a9 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RegistrationRecoveryPasswords.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RegistrationRecoveryPasswords.java
@@ -23,7 +23,6 @@ import reactor.core.scheduler.Scheduler;
 import reactor.util.function.Tuple3;
 import reactor.util.function.Tuples;
 import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 import software.amazon.awssdk.services.dynamodb.model.Delete;
 import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
@@ -33,7 +32,7 @@ import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
 import software.amazon.awssdk.services.dynamodb.model.TransactWriteItemsRequest;
 import software.amazon.awssdk.services.dynamodb.model.TransactionCanceledException;
 
-public class RegistrationRecoveryPasswords extends AbstractDynamoDbStore {
+public class RegistrationRecoveryPasswords {
 
   // As a temporary transitional measure, this can be either a string representation of an E164-formatted phone number
   // or a UUID (PNI) string
@@ -53,18 +52,8 @@ public class RegistrationRecoveryPasswords extends AbstractDynamoDbStore {
   public RegistrationRecoveryPasswords(
       final String tableName,
       final Duration expiration,
-      final DynamoDbClient dynamoDbClient,
-      final DynamoDbAsyncClient asyncClient) {
-    this(tableName, expiration, dynamoDbClient, asyncClient, Clock.systemUTC());
-  }
-
-  RegistrationRecoveryPasswords(
-      final String tableName,
-      final Duration expiration,
-      final DynamoDbClient dynamoDbClient,
       final DynamoDbAsyncClient asyncClient,
       final Clock clock) {
-    super(dynamoDbClient);
     this.tableName = requireNonNull(tableName);
     this.expiration = requireNonNull(expiration);
     this.asyncClient = requireNonNull(asyncClient);
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
index ffdd002db..f547cc820 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java
@@ -167,9 +167,8 @@ record CommandDependencies(
     RegistrationRecoveryPasswords registrationRecoveryPasswords = new RegistrationRecoveryPasswords(
         configuration.getDynamoDbTables().getRegistrationRecovery().getTableName(),
         configuration.getDynamoDbTables().getRegistrationRecovery().getExpiration(),
-        dynamoDbClient,
-        dynamoDbAsyncClient
-    );
+        dynamoDbAsyncClient,
+        clock);
 
     ClientPublicKeys clientPublicKeys =
         new ClientPublicKeys(dynamoDbAsyncClient, configuration.getDynamoDbTables().getClientPublicKeys().getTableName());
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RegistrationRecoveryTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RegistrationRecoveryTest.java
index d723671cc..4c1348747 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RegistrationRecoveryTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RegistrationRecoveryTest.java
@@ -73,7 +73,6 @@ public class RegistrationRecoveryTest {
     registrationRecoveryPasswords = new RegistrationRecoveryPasswords(
         Tables.REGISTRATION_RECOVERY_PASSWORDS.tableName(),
         EXPIRATION,
-        DYNAMO_DB_EXTENSION.getDynamoDbClient(),
         DYNAMO_DB_EXTENSION.getDynamoDbAsyncClient(),
         CLOCK
     );