diff --git a/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandler.kt b/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandler.kt index 799c5b8..f772546 100644 --- a/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandler.kt +++ b/src/main/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandler.kt @@ -19,11 +19,6 @@ class XirsysSessionHandler( ) : SessionHandler { companion object { const val SERVER_NAME = "xirsys.com" - - private val regionalUriRegex = Regex(pattern = "(?\\w+):[\\w-]+\\.xirsys\\.com(?.*)") - private val regionalUriReplace = "\${protocol}://global.xirsys.net\${query}" - fun normalizeAndReplaceUriWithGlobal(regionalUri: String) = - regionalUriRegex.replace(input = regionalUri, replacement = regionalUriReplace) } private val xirsysClient: XirsysClient = RestClientBuilder.newBuilder() @@ -108,7 +103,7 @@ class XirsysSessionHandler( // A sample response looks like "stun:fr-turn1.xirsys.com" // The java URI class fails to read host and port due to the missing // after the : // Thus we "normalize" the uri, even though it is technically valid - normalizeAndReplaceUriWithGlobal(url) + url.replaceFirst(":", "://") }, ), ) diff --git a/src/test/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandlerTest.kt b/src/test/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandlerTest.kt deleted file mode 100644 index 18ddbeb..0000000 --- a/src/test/kotlin/com/faforever/icebreaker/service/xirsys/XirsysSessionHandlerTest.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.faforever.icebreaker.service.xirsys - -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test - -class XirsysSessionHandlerTest { - @Test - fun `it should replace xirsys urls with global one and normalize the protocol`() { - val input = "stun:fr-turn1.xirsys.com" - - val result = XirsysSessionHandler.normalizeAndReplaceUriWithGlobal(input) - - assertEquals("stun://global.xirsys.net", result) - } -}