Make push notification senders available via CommandDependencies

Author: jon-signal

service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java

@@ -75,6 +75,8 @@ record CommandDependencies(
     MessagesManager messagesManager,
     ClientPresenceManager clientPresenceManager,
     KeysManager keysManager,
+    APNSender apnSender,
+    FcmSender fcmSender,
     PushNotificationManager pushNotificationManager,
     PushNotificationExperimentSamples pushNotificationExperimentSamples,
     FaultTolerantRedisCluster cacheCluster,
@@ -254,6 +256,7 @@ static CommandDependencies build(
             configuration.getDynamoDbTables().getPushNotificationExperimentSamples().getTableName(),
             Clock.systemUTC());
 
+    environment.lifecycle().manage(apnSender);
     environment.lifecycle().manage(messagesCache);
     environment.lifecycle().manage(clientPresenceManager);
     environment.lifecycle().manage(new ManagedAwsCrt());
@@ -266,6 +269,8 @@ static CommandDependencies build(
         messagesManager,
         clientPresenceManager,
         keys,
+        apnSender,
+        fcmSender,
         pushNotificationManager,
         pushNotificationExperimentSamples,
         cacheCluster,

service/src/main/java/org/whispersystems/textsecuregcm/workers/ScheduledApnPushNotificationSenderServiceCommand.java

@@ -5,20 +5,15 @@
 
 package org.whispersystems.textsecuregcm.workers;
 
-import static com.codahale.metrics.MetricRegistry.name;
-
 import io.dropwizard.core.Application;
 import io.dropwizard.core.cli.ServerCommand;
 import io.dropwizard.core.server.DefaultServerFactory;
 import io.dropwizard.core.setup.Environment;
 import io.dropwizard.jetty.HttpsConnectorFactory;
-import java.util.concurrent.ExecutorService;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import org.whispersystems.textsecuregcm.WhisperServerConfiguration;
 import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
-import org.whispersystems.textsecuregcm.push.APNSender;
-import org.whispersystems.textsecuregcm.push.FcmSender;
 import org.whispersystems.textsecuregcm.push.PushNotificationScheduler;
 import org.whispersystems.textsecuregcm.util.logging.UncaughtExceptionHandler;
 
@@ -73,15 +68,9 @@ protected void run(Environment environment, Namespace namespace, WhisperServerCo
           });
     }
 
-    final ExecutorService pushNotificationSenderExecutor = environment.lifecycle().executorService(name(getClass(), "apnSender-%d"))
-        .maxThreads(1).minThreads(1).build();
-
-    final APNSender apnSender = new APNSender(pushNotificationSenderExecutor, configuration.getApnConfiguration());
-    final FcmSender fcmSender = new FcmSender(pushNotificationSenderExecutor, configuration.getFcmConfiguration().credentials().value());
     final PushNotificationScheduler pushNotificationScheduler = new PushNotificationScheduler(
-        deps.pushSchedulerCluster(), apnSender, fcmSender, deps.accountsManager(), namespace.getInt(WORKER_COUNT), namespace.getInt(MAX_CONCURRENCY));
+        deps.pushSchedulerCluster(), deps.apnSender(), deps.fcmSender(), deps.accountsManager(), namespace.getInt(WORKER_COUNT), namespace.getInt(MAX_CONCURRENCY));
 
-    environment.lifecycle().manage(apnSender);
     environment.lifecycle().manage(pushNotificationScheduler);
 
     MetricsUtil.registerSystemResourceMetrics(environment);

service/src/test/java/org/whispersystems/textsecuregcm/workers/FinishPushNotificationExperimentCommandTest.java

@@ -72,6 +72,8 @@ void setUp() {
         null,
         null,
         null,
+        null,
+        null,
         pushNotificationExperimentSamples,
         null,
         null,

service/src/test/java/org/whispersystems/textsecuregcm/workers/NotifyIdleDevicesWithoutMessagesCommandTest.java

@@ -65,6 +65,8 @@ private TestNotifyIdleDevicesWithoutMessagesCommand(final MessagesManager messag
           null,
           null,
           null,
+          null,
+          null,
           null);
 
       this.idleDeviceNotificationScheduler = idleDeviceNotificationScheduler;

service/src/test/java/org/whispersystems/textsecuregcm/workers/StartPushNotificationExperimentCommandTest.java

@@ -61,6 +61,8 @@ public TestStartPushNotificationExperimentCommand(
           null,
           null,
           null,
+          null,
+          null,
           pushNotificationExperimentSamples,
           null,
           null,