From e25252dc69454524e5ee10e3ba426d10c240278c Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 9 Sep 2022 15:54:27 -0500
Subject: [PATCH] Remove unused exception

---
 .../textsecuregcm/WhisperServerService.java   |  8 -----
 .../controllers/MessageController.java        |  3 +-
 .../limits/RateLimitChallengeException.java   | 29 -----------------
 .../RateLimitChallengeExceptionMapper.java    | 32 -------------------
 4 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeException.java
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/mappers/RateLimitChallengeExceptionMapper.java

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index a6018ebc0..9fb6b657e 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -124,7 +124,6 @@ import org.whispersystems.textsecuregcm.mappers.IOExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.ImpossiblePhoneNumberExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.InvalidWebsocketAddressExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.NonNormalizedPhoneNumberExceptionMapper;
-import org.whispersystems.textsecuregcm.mappers.RateLimitChallengeExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.RateLimitExceededExceptionMapper;
 import org.whispersystems.textsecuregcm.mappers.ServerRejectedExceptionMapper;
 import org.whispersystems.textsecuregcm.metrics.ApplicationShutdownMonitor;
@@ -717,13 +716,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     registerCorsFilter(environment);
     registerExceptionMappers(environment, webSocketEnvironment, provisioningEnvironment);
 
-    RateLimitChallengeExceptionMapper rateLimitChallengeExceptionMapper =
-        new RateLimitChallengeExceptionMapper(rateLimitChallengeOptionManager);
-
-    environment.jersey().register(rateLimitChallengeExceptionMapper);
-    webSocketEnvironment.jersey().register(rateLimitChallengeExceptionMapper);
-    provisioningEnvironment.jersey().register(rateLimitChallengeExceptionMapper);
-
     environment.jersey().property(ServerProperties.UNWRAP_COMPLETION_STAGE_IN_WRITER_ENABLE, Boolean.TRUE);
     webSocketEnvironment.jersey().property(ServerProperties.UNWRAP_COMPLETION_STAGE_IN_WRITER_ENABLE, Boolean.TRUE);
     provisioningEnvironment.jersey().property(ServerProperties.UNWRAP_COMPLETION_STAGE_IN_WRITER_ENABLE, Boolean.TRUE);
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 3d6c0d1c7..450169e3a 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
@@ -72,7 +72,6 @@ import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntityList;
 import org.whispersystems.textsecuregcm.entities.SendMessageResponse;
 import org.whispersystems.textsecuregcm.entities.SendMultiRecipientMessageResponse;
 import org.whispersystems.textsecuregcm.entities.StaleDevices;
-import org.whispersystems.textsecuregcm.limits.RateLimitChallengeException;
 import org.whispersystems.textsecuregcm.limits.RateLimiters;
 import org.whispersystems.textsecuregcm.metrics.MessageMetrics;
 import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil;
@@ -163,7 +162,7 @@ public class MessageController {
       @HeaderParam("X-Forwarded-For") String forwardedFor,
       @PathParam("destination") UUID destinationUuid,
       @NotNull @Valid IncomingMessageList messages)
-      throws RateLimitExceededException, RateLimitChallengeException {
+      throws RateLimitExceededException {
 
     if (source.isEmpty() && accessKey.isEmpty()) {
       throw new WebApplicationException(Response.Status.UNAUTHORIZED);
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeException.java b/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeException.java
deleted file mode 100644
index 656830564..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.limits;
-
-import java.time.Duration;
-import org.whispersystems.textsecuregcm.storage.Account;
-
-public class RateLimitChallengeException extends Exception {
-
-  private final Account account;
-  private final Duration retryAfter;
-
-  public RateLimitChallengeException(final Account account, final Duration retryAfter) {
-    this.account = account;
-    this.retryAfter = retryAfter;
-  }
-
-  public Account getAccount() {
-    return account;
-  }
-
-  public Duration getRetryAfter() {
-    return retryAfter;
-  }
-
-}
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/mappers/RateLimitChallengeExceptionMapper.java b/service/src/main/java/org/whispersystems/textsecuregcm/mappers/RateLimitChallengeExceptionMapper.java
deleted file mode 100644
index 2d8a47f05..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/mappers/RateLimitChallengeExceptionMapper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2021 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.mappers;
-
-import java.util.UUID;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import org.whispersystems.textsecuregcm.entities.RateLimitChallenge;
-import org.whispersystems.textsecuregcm.limits.RateLimitChallengeException;
-import org.whispersystems.textsecuregcm.limits.RateLimitChallengeOptionManager;
-
-public class RateLimitChallengeExceptionMapper implements ExceptionMapper<RateLimitChallengeException> {
-
-  private final RateLimitChallengeOptionManager rateLimitChallengeOptionManager;
-
-  public RateLimitChallengeExceptionMapper(final RateLimitChallengeOptionManager rateLimitChallengeOptionManager) {
-    this.rateLimitChallengeOptionManager = rateLimitChallengeOptionManager;
-  }
-
-  @Override
-  public Response toResponse(final RateLimitChallengeException exception) {
-    return Response.status(428)
-        .entity(new RateLimitChallenge(UUID.randomUUID().toString(),
-            rateLimitChallengeOptionManager.getChallengeOptions(exception.getAccount())))
-        .header("Retry-After", exception.getRetryAfter().toSeconds())
-        .build();
-  }
-
-}