From 5a89e66fc02bc6210fba7ad7f53ebb488baa94fd Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Wed, 11 Jan 2023 17:14:53 -0500
Subject: [PATCH] Convert `AccountIdentityResponse` to a record

---
 .../entities/AccountIdentityResponse.java     | 56 ++-----------------
 .../controllers/AccountControllerTest.java    | 20 +++----
 2 files changed, 16 insertions(+), 60 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountIdentityResponse.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountIdentityResponse.java
index 7c7a307ba..d1b2c5762 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountIdentityResponse.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountIdentityResponse.java
@@ -5,56 +5,12 @@
 
 package org.whispersystems.textsecuregcm.entities;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import javax.annotation.Nullable;
 import java.util.UUID;
+import javax.annotation.Nullable;
 
-public class AccountIdentityResponse {
-
-  private final UUID uuid;
-  private final String number;
-  private final UUID pni;
-
-  @Nullable
-  private final String username;
-
-  private final boolean storageCapable;
-
-  @JsonCreator
-  public AccountIdentityResponse(
-      @JsonProperty("uuid") final UUID uuid,
-      @JsonProperty("number") final String number,
-      @JsonProperty("pni") final UUID pni,
-      @JsonProperty("username") @Nullable final String username,
-      @JsonProperty("storageCapable") final boolean storageCapable) {
-
-    this.uuid = uuid;
-    this.number = number;
-    this.pni = pni;
-    this.username = username;
-    this.storageCapable = storageCapable;
-  }
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-  public String getNumber() {
-    return number;
-  }
-
-  public UUID getPni() {
-    return pni;
-  }
-
-  @Nullable
-  public String getUsername() {
-    return username;
-  }
-
-  public boolean isStorageCapable() {
-    return storageCapable;
-  }
+public record AccountIdentityResponse(UUID uuid,
+                                      String number,
+                                      UUID pni,
+                                      @Nullable String username,
+                                      boolean storageCapable) {
 }
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 df91659c8..be00c1578 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java
@@ -1002,7 +1002,7 @@ class AccountControllerTest {
             .put(Entity.entity(new AccountAttributes(false, 3333, null, Hex.toStringCondensed(registration_lock_key), true, null),
                 MediaType.APPLICATION_JSON_TYPE), AccountIdentityResponse.class);
 
-    assertThat(result.getUuid()).isNotNull();
+    assertThat(result.uuid()).isNotNull();
 
     verify(pinLimiter).validate(eq(SENDER_REG_LOCK));
   }
@@ -1026,7 +1026,7 @@ class AccountControllerTest {
             .put(Entity.entity(new AccountAttributes(false, 3333, null, Hex.toStringCondensed(registration_lock_key), true, null),
                 MediaType.APPLICATION_JSON_TYPE), AccountIdentityResponse.class);
 
-    assertThat(result.getUuid()).isNotNull();
+    assertThat(result.uuid()).isNotNull();
 
     verify(pinLimiter).validate(eq(SENDER_REG_LOCK));
 
@@ -1059,7 +1059,7 @@ class AccountControllerTest {
               .put(Entity.entity(new AccountAttributes(false, 3333, null, null, true, null),
                   MediaType.APPLICATION_JSON_TYPE), AccountIdentityResponse.class);
 
-      assertThat(result.getUuid()).isNotNull();
+      assertThat(result.uuid()).isNotNull();
 
       verifyNoInteractions(pinLimiter);
     } finally {
@@ -1225,9 +1225,9 @@ class AccountControllerTest {
 
     verify(changeNumberManager).changeNumber(eq(AuthHelper.VALID_ACCOUNT), eq(number), any(), any(), any(), any());
 
-    assertThat(accountIdentityResponse.getUuid()).isEqualTo(AuthHelper.VALID_UUID);
-    assertThat(accountIdentityResponse.getNumber()).isEqualTo(number);
-    assertThat(accountIdentityResponse.getPni()).isNotEqualTo(AuthHelper.VALID_PNI);
+    assertThat(accountIdentityResponse.uuid()).isEqualTo(AuthHelper.VALID_UUID);
+    assertThat(accountIdentityResponse.number()).isEqualTo(number);
+    assertThat(accountIdentityResponse.pni()).isNotEqualTo(AuthHelper.VALID_PNI);
   }
 
   @Test
@@ -1526,9 +1526,9 @@ class AccountControllerTest {
 
     verify(changeNumberManager).changeNumber(eq(AuthHelper.VALID_ACCOUNT), eq(number), any(), any(), any(), any());
 
-    assertThat(accountIdentityResponse.getUuid()).isEqualTo(AuthHelper.VALID_UUID);
-    assertThat(accountIdentityResponse.getNumber()).isEqualTo(number);
-    assertThat(accountIdentityResponse.getPni()).isNotEqualTo(AuthHelper.VALID_PNI);
+    assertThat(accountIdentityResponse.uuid()).isEqualTo(AuthHelper.VALID_UUID);
+    assertThat(accountIdentityResponse.number()).isEqualTo(number);
+    assertThat(accountIdentityResponse.pni()).isNotEqualTo(AuthHelper.VALID_PNI);
   }
 
   @Test
@@ -1634,7 +1634,7 @@ class AccountControllerTest {
                  .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
                  .get(AccountIdentityResponse.class);
 
-    assertThat(response.getUuid()).isEqualTo(AuthHelper.VALID_UUID);
+    assertThat(response.uuid()).isEqualTo(AuthHelper.VALID_UUID);
   }
 
   @Test