diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLockFailure.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLockFailure.java index a8b292493..0872a8649 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLockFailure.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RegistrationLockFailure.java @@ -5,32 +5,8 @@ package org.whispersystems.textsecuregcm.entities; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials; -public class RegistrationLockFailure { +public record RegistrationLockFailure(long timeRemaining, ExternalServiceCredentials backupCredentials) { - @JsonProperty - private long timeRemaining; - - @JsonProperty - private ExternalServiceCredentials backupCredentials; - - public RegistrationLockFailure() {} - - public RegistrationLockFailure(long timeRemaining, ExternalServiceCredentials backupCredentials) { - this.timeRemaining = timeRemaining; - this.backupCredentials = backupCredentials; - } - - @JsonIgnore - public long getTimeRemaining() { - return timeRemaining; - } - - @JsonIgnore - public ExternalServiceCredentials getBackupCredentials() { - return backupCredentials; - } } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java index 0175f44f3..df91659c8 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java @@ -1116,11 +1116,11 @@ class AccountControllerTest { assertThat(response.getStatus()).isEqualTo(423); RegistrationLockFailure failure = response.readEntity(RegistrationLockFailure.class); - assertThat(failure.getBackupCredentials()).isNotNull(); - assertThat(failure.getBackupCredentials().username()).isEqualTo(SENDER_REG_LOCK_UUID.toString()); - assertThat(failure.getBackupCredentials().password()).isNotEmpty(); - assertThat(failure.getBackupCredentials().password().startsWith(SENDER_REG_LOCK_UUID.toString())).isTrue(); - assertThat(failure.getTimeRemaining()).isGreaterThan(0); + assertThat(failure.backupCredentials()).isNotNull(); + assertThat(failure.backupCredentials().username()).isEqualTo(SENDER_REG_LOCK_UUID.toString()); + assertThat(failure.backupCredentials().password()).isNotEmpty(); + assertThat(failure.backupCredentials().password().startsWith(SENDER_REG_LOCK_UUID.toString())).isTrue(); + assertThat(failure.timeRemaining()).isGreaterThan(0); // verify(senderRegLockAccount).lockAuthenticationCredentials(); // verify(clientPresenceManager, atLeastOnce()).disconnectAllPresences(eq(SENDER_REG_LOCK_UUID), any());