diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ArchiveController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ArchiveController.java index c692557e1..c17447006 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ArchiveController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ArchiveController.java @@ -311,9 +311,8 @@ public class ArchiveController { @Schema(description = "The name of the most recent message backup on the cdn. The backup is at /backupDir/backupName") String backupName, - @Nullable @Schema(description = "The amount of space used to store media") - Long usedSpace) {} + long usedSpace) {} @GET @Produces(MediaType.APPLICATION_JSON) @@ -345,7 +344,7 @@ public class ArchiveController { backupInfo.backupSubdir(), backupInfo.mediaSubdir(), backupInfo.messageBackupKey(), - backupInfo.mediaUsedSpace().orElse(null))); + backupInfo.mediaUsedSpace().orElse(0L))); } public record SetPublicKeyRequest( diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/ArchiveControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/ArchiveControllerTest.java index 1a3f0c792..e89ef08fe 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/ArchiveControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/ArchiveControllerTest.java @@ -337,7 +337,7 @@ public class ArchiveControllerTest { assertThat(response.backupDir()).isEqualTo("myBackupDir"); assertThat(response.backupName()).isEqualTo("filename"); assertThat(response.cdn()).isEqualTo(1); - assertThat(response.usedSpace()).isNull(); + assertThat(response.usedSpace()).isEqualTo(0L); } @Test