Use the precomputed coturn values (#103)

FAForever · Jun 4, 2023 · f5a7832 · f5a7832
1 parent 1a4afa3
commit f5a7832
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,8 @@ buildscript {
   }
 }
 
-tasks.withType(Test) {
+// source: https://github.com/mendhak/Gradle-Travis-Colored-Output/blob/master/ColoredOutput.gradle
+tasks.withType(Test).configureEach {
 
   String ANSI_BOLD_WHITE = "\u001B[0;1m";
   String ANSI_RESET = "\u001B[0m";
@@ -43,7 +44,7 @@ tasks.withType(Test) {
 
 
       def nameParts = descriptor.parent.name.split("\\.")
-      def simpleParentName  = nameParts[nameParts.length - 1]
+      def simpleParentName = nameParts[nameParts.length - 1]
 
       out.println()
       out.println(simpleParentName + " > " + descriptor.name + " STANDARD_OUT")
@@ -77,7 +78,6 @@ tasks.withType(Test) {
       out.println("--------------------------------------------------------------------------");
     }
   }
-
 }
 
 subprojects {

diff --git a/faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoturnServer.java b/faf-commons-api/src/main/java/com/faforever/commons/api/dto/CoturnServer.java
@@ -7,6 +7,9 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.net.URI;
+import java.util.Set;
+
 @Data
 @ToString(onlyExplicitlyIncluded = true)
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
@@ -17,8 +20,9 @@ public class CoturnServer implements ElideEntity {
   @EqualsAndHashCode.Include
   private String id;
   private String region;
-  private String host;
-  private Integer port;
-  private String key;
-  private Boolean active;
+  private boolean active;
+  private Set<URI> urls;
+  private String username;
+  private String credential;
+  private String credentialType;
 }