Change config values representing uris to URI

wendigo · wendigo · commit aae3a43342bb · 2025-07-02T14:45:30.000+02:00
Updated airlift version supports coercion from String to URI automatically
during configuration parsing.
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticConfigurationProvider.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticConfigurationProvider.java
@@ -15,8 +15,6 @@
 
 import com.google.inject.Inject;
 
-import java.net.URI;
-
 public class StaticConfigurationProvider
         implements OAuth2ServerConfigProvider
 {
@@ -27,11 +25,11 @@ public class StaticConfigurationProvider
     {
         this.config = new OAuth2ServerConfig(
                 config.getAccessTokenIssuer(),
-                URI.create(config.getAuthUrl()),
-                URI.create(config.getTokenUrl()),
-                URI.create(config.getJwksUrl()),
-                config.getUserinfoUrl().map(URI::create),
-                config.getEndSessionUrl().map(URI::create));
+                config.getAuthUrl(),
+                config.getTokenUrl(),
+                config.getJwksUrl(),
+                config.getUserinfoUrl(),
+                config.getEndSessionUrl());
     }
 
     @Override
diff --git a/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticOAuth2ServerConfig.java b/core/trino-main/src/main/java/io/trino/server/security/oauth2/StaticOAuth2ServerConfig.java
@@ -17,6 +17,7 @@
 import io.airlift.configuration.ConfigDescription;
 import jakarta.validation.constraints.NotNull;
 
+import java.net.URI;
 import java.util.Optional;
 
 public class StaticOAuth2ServerConfig
@@ -29,11 +30,11 @@ public class StaticOAuth2ServerConfig
     public static final String END_SESSION_URL = "http-server.authentication.oauth2.end-session-url";
 
     private Optional<String> accessTokenIssuer = Optional.empty();
-    private String authUrl;
-    private String tokenUrl;
-    private String jwksUrl;
-    private Optional<String> userinfoUrl = Optional.empty();
-    private Optional<String> endSessionUrl = Optional.empty();
+    private URI authUrl;
+    private URI tokenUrl;
+    private URI jwksUrl;
+    private Optional<URI> userinfoUrl = Optional.empty();
+    private Optional<URI> endSessionUrl = Optional.empty();
 
     @NotNull
     public Optional<String> getAccessTokenIssuer()
@@ -50,68 +51,68 @@ public StaticOAuth2ServerConfig setAccessTokenIssuer(String accessTokenIssuer)
     }
 
     @NotNull
-    public String getAuthUrl()
+    public URI getAuthUrl()
     {
         return authUrl;
     }
 
     @Config(AUTH_URL)
     @ConfigDescription("URL of the authorization server's authorization endpoint")
-    public StaticOAuth2ServerConfig setAuthUrl(String authUrl)
+    public StaticOAuth2ServerConfig setAuthUrl(URI authUrl)
     {
         this.authUrl = authUrl;
         return this;
     }
 
     @NotNull
-    public String getTokenUrl()
+    public URI getTokenUrl()
     {
         return tokenUrl;
     }
 
     @Config(TOKEN_URL)
     @ConfigDescription("URL of the authorization server's token endpoint")
-    public StaticOAuth2ServerConfig setTokenUrl(String tokenUrl)
+    public StaticOAuth2ServerConfig setTokenUrl(URI tokenUrl)
     {
         this.tokenUrl = tokenUrl;
         return this;
     }
 
     @NotNull
-    public String getJwksUrl()
+    public URI getJwksUrl()
     {
         return jwksUrl;
     }
 
     @Config(JWKS_URL)
     @ConfigDescription("URL of the authorization server's JWKS (JSON Web Key Set) endpoint")
-    public StaticOAuth2ServerConfig setJwksUrl(String jwksUrl)
+    public StaticOAuth2ServerConfig setJwksUrl(URI jwksUrl)
     {
         this.jwksUrl = jwksUrl;
         return this;
     }
 
-    public Optional<String> getUserinfoUrl()
+    public Optional<URI> getUserinfoUrl()
     {
         return userinfoUrl;
     }
 
     @Config(USERINFO_URL)
     @ConfigDescription("URL of the userinfo endpoint")
-    public StaticOAuth2ServerConfig setUserinfoUrl(String userinfoUrl)
+    public StaticOAuth2ServerConfig setUserinfoUrl(URI userinfoUrl)
     {
         this.userinfoUrl = Optional.ofNullable(userinfoUrl);
         return this;
     }
 
-    public Optional<String> getEndSessionUrl()
+    public Optional<URI> getEndSessionUrl()
     {
         return endSessionUrl;
     }
 
     @Config(END_SESSION_URL)
     @ConfigDescription("URL of the end session endpoint")
-    public StaticOAuth2ServerConfig setEndSessionUrl(String endSessionUrl)
+    public StaticOAuth2ServerConfig setEndSessionUrl(URI endSessionUrl)
     {
         this.endSessionUrl = Optional.ofNullable(endSessionUrl);
         return this;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastoreConfig.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastoreConfig.java
@@ -20,6 +20,7 @@
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 
+import java.net.URI;
 import java.util.Optional;
 
 @DefunctConfig({
@@ -33,9 +34,9 @@
 public class GlueHiveMetastoreConfig
 {
     private Optional<String> glueRegion = Optional.empty();
-    private Optional<String> glueEndpointUrl = Optional.empty();
+    private Optional<URI> glueEndpointUrl = Optional.empty();
     private Optional<String> glueStsRegion = Optional.empty();
-    private Optional<String> glueStsEndpointUrl = Optional.empty();
+    private Optional<URI> glueStsEndpointUrl = Optional.empty();
     private boolean pinGlueClientToCurrentRegion;
     private int maxGlueErrorRetries = 10;
     private int maxGlueConnections = 30;
@@ -64,14 +65,14 @@ public GlueHiveMetastoreConfig setGlueRegion(String region)
         return this;
     }
 
-    public Optional<String> getGlueEndpointUrl()
+    public Optional<URI> getGlueEndpointUrl()
     {
         return glueEndpointUrl;
     }
 
     @Config("hive.metastore.glue.endpoint-url")
     @ConfigDescription("Glue API endpoint URL")
-    public GlueHiveMetastoreConfig setGlueEndpointUrl(String glueEndpointUrl)
+    public GlueHiveMetastoreConfig setGlueEndpointUrl(URI glueEndpointUrl)
     {
         this.glueEndpointUrl = Optional.ofNullable(glueEndpointUrl);
         return this;
@@ -90,14 +91,14 @@ public GlueHiveMetastoreConfig setGlueStsRegion(String glueStsRegion)
         return this;
     }
 
-    public Optional<String> getGlueStsEndpointUrl()
+    public Optional<URI> getGlueStsEndpointUrl()
     {
         return glueStsEndpointUrl;
     }
 
     @Config("hive.metastore.glue.sts.endpoint")
     @ConfigDescription("AWS STS endpoint for Glue authentication")
-    public GlueHiveMetastoreConfig setGlueStsEndpointUrl(String glueStsEndpointUrl)
+    public GlueHiveMetastoreConfig setGlueStsEndpointUrl(URI glueStsEndpointUrl)
     {
         this.glueStsEndpointUrl = Optional.ofNullable(glueStsEndpointUrl);
         return this;
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreModule.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreModule.java
@@ -49,7 +49,6 @@
 import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
 import software.amazon.awssdk.services.sts.auth.StsWebIdentityTokenFileCredentialsProvider;
 
-import java.net.URI;
 import java.util.EnumSet;
 import java.util.Optional;
 import java.util.Set;
@@ -186,7 +185,7 @@ else if (config.getIamRole().isPresent()) {
         if (config.getGlueEndpointUrl().isPresent()) {
             checkArgument(config.getGlueRegion().isPresent(), "Glue region must be set when Glue endpoint URL is set");
             glue.region(Region.of(config.getGlueRegion().get()));
-            glue.endpointOverride(URI.create(config.getGlueEndpointUrl().get()));
+            glue.endpointOverride(config.getGlueEndpointUrl().get());
         }
         else if (config.getGlueRegion().isPresent()) {
             glue.region(Region.of(config.getGlueRegion().get()));
@@ -215,7 +214,7 @@ private static StsClient getStsClient(GlueHiveMetastoreConfig config, Optional<S
         staticCredentialsProvider.ifPresent(sts::credentialsProvider);
 
         if (config.getGlueStsEndpointUrl().isPresent() && config.getGlueStsRegion().isPresent()) {
-            sts.endpointOverride(URI.create(config.getGlueStsEndpointUrl().get()))
+            sts.endpointOverride(config.getGlueStsEndpointUrl().get())
                     .region(Region.of(config.getGlueStsRegion().get()));
         }
         else if (config.getGlueStsRegion().isPresent()) {
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueHiveMetastoreConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestGlueHiveMetastoreConfig.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;
@@ -74,9 +75,9 @@ void testExplicitPropertyMapping()
 
         GlueHiveMetastoreConfig expected = new GlueHiveMetastoreConfig()
                 .setGlueRegion("us-east-1")
-                .setGlueEndpointUrl("http://foo.bar")
+                .setGlueEndpointUrl(URI.create("http://foo.bar"))
                 .setGlueStsRegion("us-east-3")
-                .setGlueStsEndpointUrl("http://sts.foo.bar")
+                .setGlueStsEndpointUrl(URI.create("http://sts.foo.bar"))
                 .setPinGlueClientToCurrentRegion(true)
                 .setMaxGlueConnections(10)
                 .setMaxGlueErrorRetries(20)

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`import io.airlift.configuration.ConfigDescription;`
`18`	`18`	`import jakarta.validation.constraints.NotNull;`
`19`	`19`
	`20`	`+import java.net.URI;`
`20`	`21`	`import java.util.Optional;`
`21`	`22`
`22`	`23`	`public class StaticOAuth2ServerConfig`
`@@ -29,11 +30,11 @@ public class StaticOAuth2ServerConfig`
`29`	`30`	`public static final String END_SESSION_URL = "http-server.authentication.oauth2.end-session-url";`
`30`	`31`
`31`	`32`	`private Optional<String> accessTokenIssuer = Optional.empty();`
`32`		`- private String authUrl;`
`33`		`- private String tokenUrl;`
`34`		`- private String jwksUrl;`
`35`		`- private Optional<String> userinfoUrl = Optional.empty();`
`36`		`- private Optional<String> endSessionUrl = Optional.empty();`
	`33`	`+ private URI authUrl;`
	`34`	`+ private URI tokenUrl;`
	`35`	`+ private URI jwksUrl;`
	`36`	`+ private Optional<URI> userinfoUrl = Optional.empty();`
	`37`	`+ private Optional<URI> endSessionUrl = Optional.empty();`
`37`	`38`
`38`	`39`	`@NotNull`
`39`	`40`	`public Optional<String> getAccessTokenIssuer()`
`@@ -50,68 +51,68 @@ public StaticOAuth2ServerConfig setAccessTokenIssuer(String accessTokenIssuer)`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`@NotNull`
`53`		`- public String getAuthUrl()`
	`54`	`+ public URI getAuthUrl()`
`54`	`55`	`{`
`55`	`56`	`return authUrl;`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`@Config(AUTH_URL)`
`59`	`60`	`@ConfigDescription("URL of the authorization server's authorization endpoint")`
`60`		`- public StaticOAuth2ServerConfig setAuthUrl(String authUrl)`
	`61`	`+ public StaticOAuth2ServerConfig setAuthUrl(URI authUrl)`
`61`	`62`	`{`
`62`	`63`	`this.authUrl = authUrl;`
`63`	`64`	`return this;`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`@NotNull`
`67`		`- public String getTokenUrl()`
	`68`	`+ public URI getTokenUrl()`
`68`	`69`	`{`
`69`	`70`	`return tokenUrl;`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`@Config(TOKEN_URL)`
`73`	`74`	`@ConfigDescription("URL of the authorization server's token endpoint")`
`74`		`- public StaticOAuth2ServerConfig setTokenUrl(String tokenUrl)`
	`75`	`+ public StaticOAuth2ServerConfig setTokenUrl(URI tokenUrl)`
`75`	`76`	`{`
`76`	`77`	`this.tokenUrl = tokenUrl;`
`77`	`78`	`return this;`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`@NotNull`
`81`		`- public String getJwksUrl()`
	`82`	`+ public URI getJwksUrl()`
`82`	`83`	`{`
`83`	`84`	`return jwksUrl;`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`@Config(JWKS_URL)`
`87`	`88`	`@ConfigDescription("URL of the authorization server's JWKS (JSON Web Key Set) endpoint")`
`88`		`- public StaticOAuth2ServerConfig setJwksUrl(String jwksUrl)`
	`89`	`+ public StaticOAuth2ServerConfig setJwksUrl(URI jwksUrl)`
`89`	`90`	`{`
`90`	`91`	`this.jwksUrl = jwksUrl;`
`91`	`92`	`return this;`
`92`	`93`	`}`
`93`	`94`
`94`		`- public Optional<String> getUserinfoUrl()`
	`95`	`+ public Optional<URI> getUserinfoUrl()`
`95`	`96`	`{`
`96`	`97`	`return userinfoUrl;`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`@Config(USERINFO_URL)`
`100`	`101`	`@ConfigDescription("URL of the userinfo endpoint")`
`101`		`- public StaticOAuth2ServerConfig setUserinfoUrl(String userinfoUrl)`
	`102`	`+ public StaticOAuth2ServerConfig setUserinfoUrl(URI userinfoUrl)`
`102`	`103`	`{`
`103`	`104`	`this.userinfoUrl = Optional.ofNullable(userinfoUrl);`
`104`	`105`	`return this;`
`105`	`106`	`}`
`106`	`107`
`107`		`- public Optional<String> getEndSessionUrl()`
	`108`	`+ public Optional<URI> getEndSessionUrl()`
`108`	`109`	`{`
`109`	`110`	`return endSessionUrl;`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`@Config(END_SESSION_URL)`
`113`	`114`	`@ConfigDescription("URL of the end session endpoint")`
`114`		`- public StaticOAuth2ServerConfig setEndSessionUrl(String endSessionUrl)`
	`115`	`+ public StaticOAuth2ServerConfig setEndSessionUrl(URI endSessionUrl)`
`115`	`116`	`{`
`116`	`117`	`this.endSessionUrl = Optional.ofNullable(endSessionUrl);`
`117`	`118`	`return this;`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import jakarta.validation.constraints.Max;`
`21`	`21`	`import jakarta.validation.constraints.Min;`
`22`	`22`
	`23`	`+import java.net.URI;`
`23`	`24`	`import java.util.Optional;`
`24`	`25`
`25`	`26`	`@DefunctConfig({`
`@@ -33,9 +34,9 @@`
`33`	`34`	`public class GlueHiveMetastoreConfig`
`34`	`35`	`{`
`35`	`36`	`private Optional<String> glueRegion = Optional.empty();`
`36`		`- private Optional<String> glueEndpointUrl = Optional.empty();`
	`37`	`+ private Optional<URI> glueEndpointUrl = Optional.empty();`
`37`	`38`	`private Optional<String> glueStsRegion = Optional.empty();`
`38`		`- private Optional<String> glueStsEndpointUrl = Optional.empty();`
	`39`	`+ private Optional<URI> glueStsEndpointUrl = Optional.empty();`
`39`	`40`	`private boolean pinGlueClientToCurrentRegion;`
`40`	`41`	`private int maxGlueErrorRetries = 10;`
`41`	`42`	`private int maxGlueConnections = 30;`
`@@ -64,14 +65,14 @@ public GlueHiveMetastoreConfig setGlueRegion(String region)`
`64`	`65`	`return this;`
`65`	`66`	`}`
`66`	`67`
`67`		`- public Optional<String> getGlueEndpointUrl()`
	`68`	`+ public Optional<URI> getGlueEndpointUrl()`
`68`	`69`	`{`
`69`	`70`	`return glueEndpointUrl;`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`@Config("hive.metastore.glue.endpoint-url")`
`73`	`74`	`@ConfigDescription("Glue API endpoint URL")`
`74`		`- public GlueHiveMetastoreConfig setGlueEndpointUrl(String glueEndpointUrl)`
	`75`	`+ public GlueHiveMetastoreConfig setGlueEndpointUrl(URI glueEndpointUrl)`
`75`	`76`	`{`
`76`	`77`	`this.glueEndpointUrl = Optional.ofNullable(glueEndpointUrl);`
`77`	`78`	`return this;`
`@@ -90,14 +91,14 @@ public GlueHiveMetastoreConfig setGlueStsRegion(String glueStsRegion)`
`90`	`91`	`return this;`
`91`	`92`	`}`
`92`	`93`
`93`		`- public Optional<String> getGlueStsEndpointUrl()`
	`94`	`+ public Optional<URI> getGlueStsEndpointUrl()`
`94`	`95`	`{`
`95`	`96`	`return glueStsEndpointUrl;`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`@Config("hive.metastore.glue.sts.endpoint")`
`99`	`100`	`@ConfigDescription("AWS STS endpoint for Glue authentication")`
`100`		`- public GlueHiveMetastoreConfig setGlueStsEndpointUrl(String glueStsEndpointUrl)`
	`101`	`+ public GlueHiveMetastoreConfig setGlueStsEndpointUrl(URI glueStsEndpointUrl)`
`101`	`102`	`{`
`102`	`103`	`this.glueStsEndpointUrl = Optional.ofNullable(glueStsEndpointUrl);`
`103`	`104`	`return this;`