diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/clustermonitor/HealthChecker.java b/gateway-ha/src/main/java/io/trino/gateway/ha/clustermonitor/HealthChecker.java index ac3de3468..58bb7608d 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/clustermonitor/HealthChecker.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/clustermonitor/HealthChecker.java @@ -17,6 +17,8 @@ import java.util.List; +import static java.lang.String.format; + public class HealthChecker implements TrinoClusterStatsObserver { @@ -48,20 +50,16 @@ public void observe(List clustersStats) private void notifyUnhealthyCluster(ClusterStats clusterStats) { - notifier.sendNotification(String.format("%s - Cluster unhealthy", - clusterStats.clusterId()), - clusterStats.toString()); + notifier.sendNotification(format("%s - Cluster unhealthy", clusterStats.clusterId()), clusterStats.toString()); } private void notifyForTooManyQueuedQueries(ClusterStats clusterStats) { - notifier.sendNotification(String.format("%s - Too many queued queries", - clusterStats.clusterId()), clusterStats.toString()); + notifier.sendNotification(format("%s - Too many queued queries", clusterStats.clusterId()), clusterStats.toString()); } private void notifyForNoWorkers(ClusterStats clusterStats) { - notifier.sendNotification(String.format("%s - Number of workers", - clusterStats.clusterId()), clusterStats.toString()); + notifier.sendNotification(format("%s - Number of workers", clusterStats.clusterId()), clusterStats.toString()); } } diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/router/ConnectionChecker.java b/gateway-ha/src/main/java/io/trino/gateway/ha/router/ConnectionChecker.java index 214667f12..f723d74da 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/router/ConnectionChecker.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/router/ConnectionChecker.java @@ -18,6 +18,8 @@ import java.util.HashMap; +import static java.lang.String.format; + public class ConnectionChecker { private static final Logger log = LoggerFactory.getLogger(ConnectionChecker.class); @@ -31,8 +33,7 @@ public class ConnectionChecker ConnectionCheck getChecker(String server, int port, int interval, int failcount, int disableDuration) { - String key = String.format("%s-%d-%d-%d-%d", - server, port, interval, failcount, disableDuration); + String key = format("%s-%d-%d-%d-%d", server, port, interval, failcount, disableDuration); log.info("key is {}", key); ConnectionCheck obj = connectionChecks.get(key); diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaResourceGroupsManager.java b/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaResourceGroupsManager.java index f9091271b..9e71217f2 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaResourceGroupsManager.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaResourceGroupsManager.java @@ -24,6 +24,8 @@ import java.util.ArrayList; import java.util.List; +import static java.lang.String.format; + public class HaResourceGroupsManager implements ResourceGroupsManager { @@ -199,7 +201,7 @@ public SelectorsDetail updateSelector(SelectorsDetail selector, SelectorsDetail try { connectionManager.open(routingGroupDatabase); String query = - String.format( + format( "resource_group_id %s and priority %s " + "and user_regex %s and source_regex %s " + "and query_type %s and client_tags %s " @@ -235,7 +237,7 @@ public void deleteSelector(SelectorsDetail selector, @Nullable String routingGro try { connectionManager.open(routingGroupDatabase); String query = - String.format( + format( "resource_group_id %s and priority %s " + "and user_regex %s and source_regex %s " + "and query_type %s and client_tags %s " diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/router/RuleReloadingRoutingGroupSelector.java b/gateway-ha/src/main/java/io/trino/gateway/ha/router/RuleReloadingRoutingGroupSelector.java index eb30537d8..0ca3f56fb 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/router/RuleReloadingRoutingGroupSelector.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/router/RuleReloadingRoutingGroupSelector.java @@ -74,8 +74,7 @@ public String findRoutingGroup(HttpServletRequest request) if (attr.lastModifiedTime().toMillis() > lastUpdatedTime) { // This check is performed again to prevent parsing the rules twice in case another // thread finds the condition true and acquires the lock before this one - log.info(String.format("Updating rules to file modified at %s", - attr.lastModifiedTime())); + log.info("Updating rules to file modified at {}", attr.lastModifiedTime()); rules = ruleFactory.createRules( new FileReader(rulesConfigPath, UTF_8)); lastUpdatedTime = attr.lastModifiedTime().toMillis(); diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbOAuthManager.java b/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbOAuthManager.java index 78c51f276..ca7375e31 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbOAuthManager.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbOAuthManager.java @@ -38,6 +38,8 @@ import java.util.Objects; import java.util.Optional; +import static java.lang.String.format; + public class LbOAuthManager { private static final Logger log = LoggerFactory.getLogger(LbOAuthManager.class); @@ -83,11 +85,8 @@ public Response exchangeCodeForToken(String code, String redirectLocation) .request() .post(Entity.form(form)); - if (tokenResponse.getStatusInfo() - .getFamily() != Response.Status.Family.SUCCESSFUL) { - String message = String.format("token response failed with code %d - %s", - tokenResponse.getStatus(), - tokenResponse.readEntity(String.class)); + if (tokenResponse.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) { + String message = format("token response failed with code %d - %s", tokenResponse.getStatus(), tokenResponse.readEntity(String.class)); log.error(message); return Response.status(500).entity(message).build(); } @@ -111,7 +110,7 @@ public Response getAuthorizationCode() String clientId = oauthConfig.getClientId(); String redirectUrl = oauthConfig.getRedirectUrl(); String scopes = String.join("+", oauthConfig.getScopes()); - String url = String.format( + String url = format( "%s?client_id=%s&response_type=code&redirect_uri=%s&scope=%s", authorizationEndpoint, clientId, redirectUrl, scopes); diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/handler/TestQueryIdCachingProxyHandler.java b/gateway-ha/src/test/java/io/trino/gateway/ha/handler/TestQueryIdCachingProxyHandler.java index a51ec0862..ee4d88751 100644 --- a/gateway-ha/src/test/java/io/trino/gateway/ha/handler/TestQueryIdCachingProxyHandler.java +++ b/gateway-ha/src/test/java/io/trino/gateway/ha/handler/TestQueryIdCachingProxyHandler.java @@ -23,6 +23,7 @@ import java.io.IOException; +import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; @TestInstance(Lifecycle.PER_CLASS) @@ -57,14 +58,13 @@ public void testForwardedHostHeaderOnProxyRequest() String backendServer = "trinocluster"; String backendPort = "80"; HttpServletRequest mockServletRequest = Mockito.mock(HttpServletRequest.class); - Mockito.when(mockServletRequest.getHeader("proxytarget")).thenReturn(String.format("http://%s" - + ":%s", backendServer, backendPort)); + Mockito.when(mockServletRequest.getHeader("proxytarget")).thenReturn(format("http://%s:%s", backendServer, backendPort)); HttpClient httpClient = new HttpClient(); Request proxyRequest = httpClient.newRequest("http://localhost:80"); QueryIdCachingProxyHandler.setForwardedHostHeaderOnProxyRequest(mockServletRequest, proxyRequest); assertThat(proxyRequest.getHeaders().get("Host")) - .isEqualTo(String.format("%s:%s", backendServer, backendPort)); + .isEqualTo(format("%s:%s", backendServer, backendPort)); } @Test diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java index 365e560c2..9e25412a0 100644 --- a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java +++ b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java @@ -120,7 +120,7 @@ public void testSuccessfulHeaderAuthentication() configuration.setUser(MEMBER_OF.orElseThrow()); MultivaluedHashMap headers = new MultivaluedHashMap<>(); - headers.addFirst(HttpHeaders.AUTHORIZATION, String.format("Bearer %s", ID_TOKEN)); + headers.addFirst(HttpHeaders.AUTHORIZATION, "Bearer " + ID_TOKEN); Mockito .when(requestContext.getCookies())