Reformat to match Airlift style

Author: Chaho12

gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyRequestHandler.java

@@ -109,6 +109,39 @@ public ProxyRequestHandler(
         proxyResponseConfiguration = haGatewayConfiguration.getProxyResponseConfiguration();
     }
 
+    private static Response handleProxyException(Request request, ProxyException e)
+    {
+        log.warn(e, "Proxy request failed: %s %s", request.getMethod(), request.getUri());
+        throw badRequest(e.getMessage());
+    }
+
+    private static WebApplicationException badRequest(String message)
+    {
+        throw new WebApplicationException(
+                Response.status(Response.Status.BAD_GATEWAY)
+                        .type(TEXT_PLAIN_TYPE)
+                        .entity(message)
+                        .build());
+    }
+
+    public static QueryHistoryManager.QueryDetail getQueryDetailsFromRequest(Request request, Optional<String> username)
+    {
+        QueryHistoryManager.QueryDetail queryDetail = new QueryHistoryManager.QueryDetail();
+        queryDetail.setBackendUrl(getRemoteTarget(request.getUri()));
+        queryDetail.setCaptureTime(System.currentTimeMillis());
+        username.ifPresent(queryDetail::setUser);
+        queryDetail.setSource(request.getHeader(SOURCE_HEADER));
+
+        String queryText = new String(((StaticBodyGenerator) request.getBodyGenerator()).getBody(), UTF_8);
+        queryDetail.setQueryText(queryText);
+        return queryDetail;
+    }
+
+    private static String getRemoteTarget(URI remoteUri)
+    {
+        return format("%s://%s", remoteUri.getScheme(), remoteUri.getAuthority());
+    }
+
     @PreDestroy
     public void shutdown()
     {
@@ -188,9 +221,11 @@ private void performRequest(
 
         FluentFuture<ProxyResponse> future = executeHttp(request);
 
-        if (statementPaths.stream().anyMatch(request.getUri().getPath()::startsWith) && request.getMethod().equals(HttpMethod.POST)) {
+        if (statementPaths.stream().anyMatch(request.getUri().getPath()::startsWith)
+                && request.getMethod().equals(HttpMethod.POST)) {
             Optional<String> username = trinoRequestUserProvider.getInstance(servletRequest).getUser();
-            future = future.transform(response -> recordBackendForQueryId(request, response, username, routingDestination), executor);
+            future = future.transform(
+                    response -> recordBackendForQueryId(request, response, username, routingDestination), executor);
             if (includeClusterInfoInResponse) {
                 cookieBuilder.add(new NewCookie.Builder("trinoClusterHost").value(remoteUri.getHost()).build());
             }
@@ -224,11 +259,6 @@ else if (servletRequest.getCookies() != null) {
         return ImmutableList.of();
     }
 
-    private static String getRemoteTarget(URI remoteUri)
-    {
-        return format("%s://%s", remoteUri.getScheme(), remoteUri.getAuthority());
-    }
-
     private Response buildResponse(ProxyResponse response, ImmutableList<NewCookie> cookie)
     {
         Response.ResponseBuilder builder = Response.status(response.statusCode()).entity(response.body());
@@ -249,22 +279,8 @@ private void setupAsyncResponse(AsyncResponse asyncResponse, ListenableFuture<Re
 
     private FluentFuture<ProxyResponse> executeHttp(Request request)
     {
-        return FluentFuture.from(httpClient.executeAsync(request, new ProxyResponseHandler(proxyResponseConfiguration)));
-    }
-
-    private static Response handleProxyException(Request request, ProxyException e)
-    {
-        log.warn(e, "Proxy request failed: %s %s", request.getMethod(), request.getUri());
-        throw badRequest(e.getMessage());
-    }
-
-    private static WebApplicationException badRequest(String message)
-    {
-        throw new WebApplicationException(
-                Response.status(Response.Status.BAD_GATEWAY)
-                        .type(TEXT_PLAIN_TYPE)
-                        .entity(message)
-                        .build());
+        return FluentFuture
+                .from(httpClient.executeAsync(request, new ProxyResponseHandler(proxyResponseConfiguration)));
     }
 
     private ProxyResponse recordBackendForQueryId(Request request, ProxyResponse response, Optional<String> username,
@@ -297,19 +313,6 @@ private ProxyResponse recordBackendForQueryId(Request request, ProxyResponse res
         return response;
     }
 
-    public static QueryHistoryManager.QueryDetail getQueryDetailsFromRequest(Request request, Optional<String> username)
-    {
-        QueryHistoryManager.QueryDetail queryDetail = new QueryHistoryManager.QueryDetail();
-        queryDetail.setBackendUrl(getRemoteTarget(request.getUri()));
-        queryDetail.setCaptureTime(System.currentTimeMillis());
-        username.ifPresent(queryDetail::setUser);
-        queryDetail.setSource(request.getHeader(SOURCE_HEADER));
-
-        String queryText = new String(((StaticBodyGenerator) request.getBodyGenerator()).getBody(), UTF_8);
-        queryDetail.setQueryText(queryText);
-        return queryDetail;
-    }
-
     private void addXForwardedHeaders(HttpServletRequest servletRequest, Request.Builder requestBuilder)
     {
         requestBuilder.addHeader(X_FORWARDED_FOR, servletRequest.getRemoteAddr());

gateway-ha/src/test/java/io/trino/gateway/proxyserver/TestProxyRequestHandler.java

@@ -50,17 +50,15 @@
 @TestInstance(PER_CLASS)
 final class TestProxyRequestHandler
 {
+    private static final String OK = "OK";
+    private static final int NOT_FOUND = 404;
+    private static final MediaType MEDIA_TYPE = MediaType.parse("application/json; charset=utf-8");
+
     private final OkHttpClient httpClient = new OkHttpClient();
     private final MockWebServer mockTrinoServer = new MockWebServer();
     private final PostgreSQLContainer postgresql = new PostgreSQLContainer("postgres:17");
-
     private final int routerPort = 21001 + (int) (Math.random() * 1000);
     private final int customBackendPort = 21000 + (int) (Math.random() * 1000);
-
-    private static final String OK = "OK";
-    private static final int NOT_FOUND = 404;
-    private static final MediaType MEDIA_TYPE = MediaType.parse("application/json; charset=utf-8");
-
     private final String customPutEndpoint = "/v1/custom"; // this is enabled in test-config-template.yml
     private final String healthCheckEndpoint = "/v1/info";
 
@@ -69,7 +67,8 @@ void setup()
             throws Exception
     {
         prepareMockBackend(mockTrinoServer, customBackendPort, "default custom response");
-        mockTrinoServer.setDispatcher(new Dispatcher() {
+        mockTrinoServer.setDispatcher(new Dispatcher()
+        {
             @Override
             public MockResponse dispatch(RecordedRequest request)
             {
@@ -130,18 +129,18 @@ void testGetQueryDetailsFromRequest()
     {
         // A sample query longer than 200 characters to test against truncation.
         String longQuery = """
-        SELECT
-            c.customer_name,
-            c.customer_region,
-            COUNT(o.order_id) AS total_orders,
-            SUM(o.order_value) AS total_revenue
-        FROM
-            hive.sales_data.customers AS c
-        JOIN
-            hive.sales_data.orders AS o
-                ON c.customer_id = o.customer_id
-        WHERE
-            o.order_date >= date '2023-01-01'""";
+                SELECT
+                    c.customer_name,
+                    c.customer_region,
+                    COUNT(o.order_id) AS total_orders,
+                    SUM(o.order_value) AS total_revenue
+                FROM
+                    hive.sales_data.customers AS c
+                JOIN
+                    hive.sales_data.orders AS o
+                        ON c.customer_id = o.customer_id
+                WHERE
+                    o.order_date >= date '2023-01-01'""";
 
         io.airlift.http.client.Request request = preparePost()
                 .setUri(URI.create("http://localhost:" + routerPort + V1_STATEMENT_PATH))