diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/UrlExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/URIExtensions.kt similarity index 71% rename from jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/UrlExtensions.kt rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/URIExtensions.kt index 30a5e0f8ee..a4453ea7bc 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/UrlExtensions.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/URIExtensions.kt @@ -2,14 +2,14 @@ package build.linea import java.net.URI -fun URI.getPortWithSchemaDefaults(): Int { +fun URI.getPortWithSchemeDefaults(): Int { return if (port != -1) { port } else { when (scheme.lowercase()) { "http" -> 80 "https" -> 443 - // Focous on HTTP as it what we need for now + // Focous on HTTP as it is what we need for now else -> throw IllegalArgumentException("Unsupported scheme: $scheme") } } diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/build/linea/URIExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/build/linea/URIExtensionsTest.kt index 23a6749cc8..18701f6e26 100644 --- a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/build/linea/URIExtensionsTest.kt +++ b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/build/linea/URIExtensionsTest.kt @@ -8,12 +8,12 @@ import java.net.URI class URIExtensionsTest { @Test fun `getPortWithSchemaDefaults`() { - assertThat(URI.create("http://example.com").getPortWithSchemaDefaults()).isEqualTo(80) - assertThat(URI.create("https://example.com").getPortWithSchemaDefaults()).isEqualTo(443) - assertThat(URI.create("http://example.com:8080").getPortWithSchemaDefaults()).isEqualTo(8080) - assertThat(URI.create("https://example.com:8080").getPortWithSchemaDefaults()).isEqualTo(8080) - assertThat(URI.create("myschema://example.com:8080").getPortWithSchemaDefaults()).isEqualTo(8080) - assertThatThrownBy { (URI.create("mySchema://example.com").getPortWithSchemaDefaults()) } + assertThat(URI.create("http://example.com").getPortWithSchemeDefaults()).isEqualTo(80) + assertThat(URI.create("https://example.com").getPortWithSchemeDefaults()).isEqualTo(443) + assertThat(URI.create("http://example.com:8080").getPortWithSchemeDefaults()).isEqualTo(8080) + assertThat(URI.create("https://example.com:8080").getPortWithSchemeDefaults()).isEqualTo(8080) + assertThat(URI.create("myschema://example.com:8080").getPortWithSchemeDefaults()).isEqualTo(8080) + assertThatThrownBy { (URI.create("mySchema://example.com").getPortWithSchemeDefaults()) } .isInstanceOf(IllegalArgumentException::class.java) .hasMessage("Unsupported scheme: mySchema") } diff --git a/jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ClientOptions.kt b/jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ClientOptions.kt index 7d333b4182..3f46023c91 100644 --- a/jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ClientOptions.kt +++ b/jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ClientOptions.kt @@ -1,13 +1,13 @@ package net.consensys.linea.vertx -import build.linea.getPortWithSchemaDefaults +import build.linea.getPortWithSchemeDefaults import io.vertx.core.http.HttpClientOptions import java.net.URI fun T.setDefaultsFrom(uri: URI): T { isSsl = uri.scheme.lowercase() == "https" defaultHost = uri.host - defaultPort = uri.getPortWithSchemaDefaults() + defaultPort = uri.getPortWithSchemeDefaults() return this }