diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnToken.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnToken.java index 1b6e6a46..65682ee4 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnToken.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnToken.java @@ -5,30 +5,7 @@ package org.whispersystems.textsecuregcm.auth; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.annotations.VisibleForTesting; - import java.util.List; -public class TurnToken { - - @JsonProperty - private String username; - - @JsonProperty - private String password; - - @JsonProperty - private List urls; - - public TurnToken(String username, String password, List urls) { - this.username = username; - this.password = password; - this.urls = urls; - } - - @VisibleForTesting - List getUrls() { - return urls; - } +public record TurnToken(String username, String password, List urls) { } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/auth/TurnTokenGeneratorTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/auth/TurnTokenGeneratorTest.java index 5f9a90dc..4c0599bf 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/auth/TurnTokenGeneratorTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/auth/TurnTokenGeneratorTest.java @@ -49,7 +49,7 @@ public class TurnTokenGeneratorTest { final Map urlCounts = Stream .generate(() -> turnTokenGenerator.generate(UUID.randomUUID())) .limit(COUNT) - .flatMap(token -> token.getUrls().stream()) + .flatMap(token -> token.urls().stream()) .collect(Collectors.groupingBy(i -> i, Collectors.counting())); assertThat(urlCounts.get("always1.org")).isEqualTo(COUNT); @@ -90,7 +90,7 @@ public class TurnTokenGeneratorTest { final Map urlCounts = Stream .generate(() -> turnTokenGenerator.generate(UUID.randomUUID())) .limit(COUNT) - .flatMap(token -> token.getUrls().stream()) + .flatMap(token -> token.urls().stream()) .collect(Collectors.groupingBy(i -> i, Collectors.counting())); assertThat(urlCounts.get("always.org")).isEqualTo(COUNT); @@ -129,9 +129,9 @@ public class TurnTokenGeneratorTest { new TurnTokenGenerator(mockDynamicConfigManager, "bloop".getBytes(StandardCharsets.UTF_8)); TurnToken token = turnTokenGenerator.generate(UUID.fromString("732506d7-d04f-43a4-b1d7-8a3a91ebe8a6")); - assertThat(token.getUrls().get(0)).isEqualTo("enrolled.org"); + assertThat(token.urls().get(0)).isEqualTo("enrolled.org"); token = turnTokenGenerator.generate(UUID.randomUUID()); - assertThat(token.getUrls().get(0)).isEqualTo("unenrolled.org"); + assertThat(token.urls().get(0)).isEqualTo("unenrolled.org"); }