Fix setter for serverUri to use URI type

Signed-off-by: szymonorz <szyorz@proton.me>
trinodb · Oct 22, 2024 · 3b16199 · 3b16199
1 parent 157f4ff
commit 3b16199
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...rino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/OAuth2SecurityConfig.java b/...rino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/rest/OAuth2SecurityConfig.java
@@ -76,11 +76,9 @@ public Optional<URI> getServerUri()
 
     @Config("iceberg.rest-catalog.oauth2.server-uri")
     @ConfigDescription("The endpoint to retrieve access token from OAuth2 Server")
-    public OAuth2SecurityConfig setServerUri(String uri)
+    public OAuth2SecurityConfig setServerUri(URI serverUri)
     {
-        if (uri != null) {
-            this.serverUri = URI.create(uri);
-        }
+        this.serverUri = serverUri;
         return this;
     }
 

diff --git a/...-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestOAuth2SecurityConfig.java b/...-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestOAuth2SecurityConfig.java
@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import org.junit.jupiter.api.Test;
 
+import java.net.URI;
 import java.util.Map;
 
 import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
@@ -49,7 +50,7 @@ public void testExplicitPropertyMappings()
                 .setCredential("credential")
                 .setToken("token")
                 .setScope("scope")
-                .setServerUri("http://localhost:8080/realms/iceberg/protocol/openid-connect/token");
+                .setServerUri(URI.create("http://localhost:8080/realms/iceberg/protocol/openid-connect/token"));
         assertThat(expected.credentialOrTokenPresent()).isTrue();
         assertThat(expected.scopePresentOnlyWithCredential()).isFalse();
         assertFullMapping(properties, expected);