Convert `ExternalServiceCredentials` to a record

service/src/main/java/org/whispersystems/textsecuregcm/auth/ExternalServiceCredentials.java

@@ -6,28 +6,6 @@
 package org.whispersystems.textsecuregcm.auth;
 
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+public record ExternalServiceCredentials(String username, String password) {
 
-public class ExternalServiceCredentials {
-
-  @JsonProperty
-  private String username;
-
-  @JsonProperty
-  private String password;
-
-  public ExternalServiceCredentials(String username, String password) {
-    this.username = username;
-    this.password = password;
-  }
-
-  public ExternalServiceCredentials() {}
-
-  public String getUsername() {
-    return username;
-  }
-
-  public String getPassword() {
-    return password;
-  }
 }

service/src/main/java/org/whispersystems/textsecuregcm/securebackup/SecureBackupClient.java

@@ -57,7 +57,7 @@ public class SecureBackupClient {
                 .uri(deleteUri)
                 .DELETE()
                 .header("Authorization", "Basic " + Base64.getEncoder().encodeToString(
-                    (credentials.getUsername() + ":" + credentials.getPassword()).getBytes(StandardCharsets.UTF_8)))
+                    (credentials.username() + ":" + credentials.password()).getBytes(StandardCharsets.UTF_8)))
                 .build();
 
         return httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString()).thenApply(response -> {

service/src/main/java/org/whispersystems/textsecuregcm/securestorage/SecureStorageClient.java

@@ -58,7 +58,7 @@ public class SecureStorageClient {
                 .uri(deleteUri)
                 .DELETE()
                 .header("Authorization", "Basic " + Base64.getEncoder().encodeToString(
-                    (credentials.getUsername() + ":" + credentials.getPassword()).getBytes(StandardCharsets.UTF_8)))
+                    (credentials.username() + ":" + credentials.password()).getBytes(StandardCharsets.UTF_8)))
                 .build();
 
         return httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString()).thenApply(response -> {

service/src/test/java/org/whispersystems/textsecuregcm/controllers/AccountControllerTest.java

@@ -1117,9 +1117,9 @@ class AccountControllerTest {
 
     RegistrationLockFailure failure = response.readEntity(RegistrationLockFailure.class);
     assertThat(failure.getBackupCredentials()).isNotNull();
-    assertThat(failure.getBackupCredentials().getUsername()).isEqualTo(SENDER_REG_LOCK_UUID.toString());
+    assertThat(failure.getBackupCredentials().username()).isEqualTo(SENDER_REG_LOCK_UUID.toString());
-    assertThat(failure.getBackupCredentials().getPassword()).isNotEmpty();
+    assertThat(failure.getBackupCredentials().password()).isNotEmpty();
-    assertThat(failure.getBackupCredentials().getPassword().startsWith(SENDER_REG_LOCK_UUID.toString())).isTrue();
+    assertThat(failure.getBackupCredentials().password().startsWith(SENDER_REG_LOCK_UUID.toString())).isTrue();
     assertThat(failure.getTimeRemaining()).isGreaterThan(0);
 
     // verify(senderRegLockAccount).lockAuthenticationCredentials();

service/src/test/java/org/whispersystems/textsecuregcm/tests/auth/ExternalServiceCredentialsGeneratorTest.java

@@ -18,8 +18,8 @@ class ExternalServiceCredentialsGeneratorTest {
     ExternalServiceCredentialGenerator generator = new ExternalServiceCredentialGenerator(new byte[32], new byte[32]);
     ExternalServiceCredentials credentials = generator.generateFor("+14152222222");
 
-    assertThat(credentials.getUsername()).isNotEqualTo("+14152222222");
+    assertThat(credentials.username()).isNotEqualTo("+14152222222");
-    assertThat(credentials.getPassword().startsWith("+14152222222")).isFalse();
+    assertThat(credentials.password().startsWith("+14152222222")).isFalse();
   }
 
   @Test
@@ -27,8 +27,8 @@ class ExternalServiceCredentialsGeneratorTest {
     ExternalServiceCredentialGenerator generator = new ExternalServiceCredentialGenerator(new byte[32], new byte[32], false);
     ExternalServiceCredentials credentials = generator.generateFor("+14152222222");
 
-    assertThat(credentials.getUsername()).isEqualTo("+14152222222");
+    assertThat(credentials.username()).isEqualTo("+14152222222");
-    assertThat(credentials.getPassword().startsWith("+14152222222")).isTrue();
+    assertThat(credentials.password().startsWith("+14152222222")).isTrue();
   }
 
 }

service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ArtControllerTest.java

@@ -54,7 +54,7 @@ class ArtControllerTest {
             .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
             .get(ExternalServiceCredentials.class);
 
-    assertThat(token.getPassword()).isNotEmpty();
+    assertThat(token.password()).isNotEmpty();
-    assertThat(token.getUsername()).isNotEmpty();
+    assertThat(token.username()).isNotEmpty();
   }
 }

service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DirectoryControllerTest.java

@@ -69,8 +69,8 @@ class DirectoryControllerTest {
                      .request()
                      .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
                      .get(ExternalServiceCredentials.class);
-    assertThat(token.getUsername()).isEqualTo(validCredentials.getUsername());
+    assertThat(token.username()).isEqualTo(validCredentials.username());
-    assertThat(token.getPassword()).isEqualTo(validCredentials.getPassword());
+    assertThat(token.password()).isEqualTo(validCredentials.password());
   }
 
   @Test

service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DirectoryControllerV2Test.java

@@ -39,8 +39,8 @@ class DirectoryControllerV2Test {
     final ExternalServiceCredentials credentials = (ExternalServiceCredentials) controller.getAuthToken(
         new AuthenticatedAccount(() -> new Pair<>(account, mock(Device.class)))).getEntity();
 
-    assertEquals(credentials.getUsername(), "d369bc712e2e0dd36258");
+    assertEquals(credentials.username(), "d369bc712e2e0dd36258");
-    assertEquals(credentials.getPassword(), "1633738643:4433b0fab41f25f79dd4");
+    assertEquals(credentials.password(), "1633738643:4433b0fab41f25f79dd4");
   }
 
 }

service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/PaymentsControllerTest.java

@@ -75,8 +75,8 @@ class PaymentsControllerTest {
             .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
             .get(ExternalServiceCredentials.class);
 
-    assertThat(token.getUsername()).isEqualTo(validCredentials.getUsername());
+    assertThat(token.username()).isEqualTo(validCredentials.username());
-    assertThat(token.getPassword()).isEqualTo(validCredentials.getPassword());
+    assertThat(token.password()).isEqualTo(validCredentials.password());
   }
 
   @Test

service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/SecureStorageControllerTest.java

@@ -46,8 +46,8 @@ class SecureStorageControllerTest {
                                                       .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.VALID_UUID, AuthHelper.VALID_PASSWORD))
                                                       .get(ExternalServiceCredentials.class);
 
-    assertThat(credentials.getPassword()).isNotEmpty();
+    assertThat(credentials.password()).isNotEmpty();
-    assertThat(credentials.getUsername()).isNotEmpty();
+    assertThat(credentials.username()).isNotEmpty();
   }
 
   @Test