MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert `TurnToken` to a record

This commit is contained in:
Jon Chambers 2023-08-01 15:48:47 -04:00 committed by Jon Chambers
parent 6cf4241283
commit 6a3ecb2881
2 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
service/src/main/java/org/whispersystems/textsecuregcm/auth/TurnToken.java
View File

@ -5,30 +5,7 @@
package org.whispersystems.textsecuregcm.auth; package org.whispersystems.textsecuregcm.auth;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
import java.util.List; import java.util.List;
public class TurnToken { public record TurnToken(String username, String password, List<String> urls) {
@JsonProperty
private String username;
@JsonProperty
private String password;
@JsonProperty
private List<String> urls;
public TurnToken(String username, String password, List<String> urls) {
this.username = username;
this.password = password;
this.urls = urls;
}
@VisibleForTesting
List<String> getUrls() {
return urls;
}
} }

8
service/src/test/java/org/whispersystems/textsecuregcm/auth/TurnTokenGeneratorTest.java
View File

@ -49,7 +49,7 @@ public class TurnTokenGeneratorTest {
final Map<String, Long> urlCounts = Stream final Map<String, Long> urlCounts = Stream
.generate(() -> turnTokenGenerator.generate(UUID.randomUUID())) .generate(() -> turnTokenGenerator.generate(UUID.randomUUID()))
.limit(COUNT) .limit(COUNT)
.flatMap(token -> token.getUrls().stream()) .flatMap(token -> token.urls().stream())
.collect(Collectors.groupingBy(i -> i, Collectors.counting())); .collect(Collectors.groupingBy(i -> i, Collectors.counting()));
assertThat(urlCounts.get("always1.org")).isEqualTo(COUNT); assertThat(urlCounts.get("always1.org")).isEqualTo(COUNT);
@ -90,7 +90,7 @@ public class TurnTokenGeneratorTest {
final Map<String, Long> urlCounts = Stream final Map<String, Long> urlCounts = Stream
.generate(() -> turnTokenGenerator.generate(UUID.randomUUID())) .generate(() -> turnTokenGenerator.generate(UUID.randomUUID()))
.limit(COUNT) .limit(COUNT)
.flatMap(token -> token.getUrls().stream()) .flatMap(token -> token.urls().stream())
.collect(Collectors.groupingBy(i -> i, Collectors.counting())); .collect(Collectors.groupingBy(i -> i, Collectors.counting()));
assertThat(urlCounts.get("always.org")).isEqualTo(COUNT); assertThat(urlCounts.get("always.org")).isEqualTo(COUNT);
@ -129,9 +129,9 @@ public class TurnTokenGeneratorTest {
new TurnTokenGenerator(mockDynamicConfigManager, "bloop".getBytes(StandardCharsets.UTF_8)); new TurnTokenGenerator(mockDynamicConfigManager, "bloop".getBytes(StandardCharsets.UTF_8));
TurnToken token = turnTokenGenerator.generate(UUID.fromString("732506d7-d04f-43a4-b1d7-8a3a91ebe8a6")); 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()); token = turnTokenGenerator.generate(UUID.randomUUID());
assertThat(token.getUrls().get(0)).isEqualTo("unenrolled.org"); assertThat(token.urls().get(0)).isEqualTo("unenrolled.org");
} }