From 4a9302033a693ad23e3232da6575fafff6e0e1cb Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Wed, 10 Jun 2026 12:28:10 -0400
Subject: [PATCH] Remove the additional callback executor from
 `FoundationDbMessageStore`

---
 .../storage/foundationdb/FoundationDbMessageStore.java     | 7 ++-----
 .../storage/foundationdb/FoundationDbMessageStoreTest.java | 5 +----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/foundationdb/FoundationDbMessageStore.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/foundationdb/FoundationDbMessageStore.java
index f6fb5f162..0bb1c3c02 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/foundationdb/FoundationDbMessageStore.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/foundationdb/FoundationDbMessageStore.java
@@ -42,7 +42,6 @@ public class FoundationDbMessageStore {
 
   private final Database[] databases;
   private final VersionstampUUIDCipher versionstampUUIDCipher;
-  private final Executor executor;
   private final Clock clock;
 
   private static final Subspace MESSAGES_SUBSPACE = new Subspace(Tuple.from("M"));
@@ -64,12 +63,10 @@ public class FoundationDbMessageStore {
 
   public FoundationDbMessageStore(final Database[] databases,
       final VersionstampUUIDCipher versionstampUUIDCipher,
-      final Executor executor,
       final Clock clock) {
 
     this.databases = databases;
     this.versionstampUUIDCipher = versionstampUUIDCipher;
-    this.executor = executor;
     this.clock = clock;
   }
 
@@ -243,7 +240,7 @@ public class FoundationDbMessageStore {
         }));
 
     return CompletableFuture.allOf(messageInsertFuturesByDeviceId.values().toArray(CompletableFuture[]::new))
-        .thenApplyAsync(_ -> {
+        .thenApply(_ -> {
           final Map<Byte, Boolean> presenceByDeviceId = messageInsertFuturesByDeviceId.entrySet().stream()
               .collect(Collectors.toMap(Map.Entry::getKey, entry -> {
                 assert entry.getValue().isDone();
@@ -258,7 +255,7 @@ public class FoundationDbMessageStore {
           }
 
           return presenceByDeviceId;
-        }, executor);
+        });
   }
 
   public MessageStream getMessages(final AciServiceIdentifier aci, final Device destinationDevice) {
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/foundationdb/FoundationDbMessageStoreTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/foundationdb/FoundationDbMessageStoreTest.java
index 6741558ae..041481bb6 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/foundationdb/FoundationDbMessageStoreTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/foundationdb/FoundationDbMessageStoreTest.java
@@ -34,13 +34,13 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
@@ -49,7 +49,6 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
-import org.junitpioneer.jupiter.cartesian.CartesianTest;
 import org.whispersystems.textsecuregcm.entities.MessageProtos;
 import org.whispersystems.textsecuregcm.identity.AciServiceIdentifier;
 import org.whispersystems.textsecuregcm.storage.Device;
@@ -62,7 +61,6 @@ import org.whispersystems.textsecuregcm.util.UUIDUtil;
 import org.whispersystems.textsecuregcm.util.Util;
 import reactor.adapter.JdkFlowAdapter;
 import reactor.test.StepVerifier;
-import javax.annotation.Nullable;
 
 @Timeout(value = 5, threadMode = Timeout.ThreadMode.SEPARATE_THREAD)
 class FoundationDbMessageStoreTest {
@@ -85,7 +83,6 @@ class FoundationDbMessageStoreTest {
     foundationDbMessageStore = new FoundationDbMessageStore(
         FOUNDATION_DB_EXTENSION.getDatabases(),
         versionstampUUIDCipher,
-        Executors.newVirtualThreadPerTaskExecutor(),
         CLOCK);
   }