Fix deprecated warning

willmostly · Oct 1, 2024 · 2775b1d · 2775b1d
1 parent e86c6cd
commit 2775b1d
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
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
@@ -98,7 +98,8 @@ public Response exchangeCodeForToken(String code, String nonce, String redirectL
         TokenRequest tokenRequest = new TokenRequest(
                 oauthConfig.getTokenEndpoint(),
                 new ClientSecretBasic(new ClientID(oauthConfig.getClientId()), new Secret(oauthConfig.getClientSecret())),
-                new AuthorizationCodeGrant(new AuthorizationCode(code), oauthConfig.getRedirectUrl()));
+                new AuthorizationCodeGrant(new AuthorizationCode(code), oauthConfig.getRedirectUrl()),
+                null);
 
         TokenResponse tokenResponse;
         try {

diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java b/gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java
@@ -140,7 +140,6 @@ public static void setUpBackend(
     {
         RequestBody requestBody =
                 RequestBody.create(
-                        MediaType.parse("application/json; charset=utf-8"),
                         "{ \"name\": \""
                                 + name
                                 + "\",\"proxyTo\": \""
@@ -151,7 +150,8 @@ public static void setUpBackend(
                                 + active
                                 + ",\"routingGroup\": \""
                                 + routingGroup
-                                + "\"}");
+                                + "\"}",
+                        MediaType.parse("application/json; charset=utf-8"));
         Request request =
                 new Request.Builder()
                         .url("http://localhost:" + routerPort + "/entity?entityType=GATEWAY_BACKEND")

diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaWithRoutingRulesSingleBackend.java b/gateway-ha/src/test/java/io/trino/gateway/ha/TestGatewayHaWithRoutingRulesSingleBackend.java
@@ -62,7 +62,7 @@ void testRequestDelivery()
             throws Exception
     {
         RequestBody requestBody =
-                RequestBody.create(MediaType.parse("application/json; charset=utf-8"), "SELECT * from system.runtime.nodes");
+                RequestBody.create("SELECT * from system.runtime.nodes", MediaType.parse("application/json; charset=utf-8"));
         Request request =
                 new Request.Builder()
                         .url("http://localhost:" + routerPort + "/v1/statement")

diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/TestNoXForwarded.java b/gateway-ha/src/test/java/io/trino/gateway/ha/TestNoXForwarded.java
@@ -64,7 +64,7 @@ void testRequestDelivery()
             throws Exception
     {
         RequestBody requestBody =
-                RequestBody.create(MediaType.parse("application/json; charset=utf-8"), "SELECT 1");
+                RequestBody.create("SELECT 1", MediaType.parse("application/json; charset=utf-8"));
         Request request =
                 new Request.Builder()
                         .url("http://localhost:" + routerPort + "/v1/statement")

diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/TestTrinoResource.java b/gateway-ha/src/test/java/io/trino/gateway/ha/TestTrinoResource.java
@@ -214,7 +214,7 @@ void testDeleteResourceGroupOk()
             throws Exception
     {
         RequestBody requestBody =
-                RequestBody.create(MediaType.parse("application/json; charset=utf-8"), "");
+                RequestBody.create("", MediaType.parse("application/json; charset=utf-8"));
         Request request =
                 new Request.Builder()
                         .url("http://localhost:" + routerPort + "/trino/resourcegroup/delete/3")
@@ -230,7 +230,7 @@ void testDeleteResourceGroupNoId()
             throws Exception
     {
         RequestBody requestBody =
-                RequestBody.create(MediaType.parse("application/json; charset=utf-8"), "");
+                RequestBody.create("", MediaType.parse("application/json; charset=utf-8"));
         Request request =
                 new Request.Builder()
                         .url("http://localhost:" + routerPort + "/trino/resourcegroup/delete/")
@@ -246,7 +246,7 @@ void testDeleteGlobalPropertyOk()
             throws Exception
     {
         RequestBody requestBody =
-                RequestBody.create(MediaType.parse("application/json; charset=utf-8"), "");
+                RequestBody.create("", MediaType.parse("application/json; charset=utf-8"));
         Request request =
                 new Request.Builder()
                         .url("http://localhost:" + routerPort + "/trino/globalproperty/delete/cpu_quota_period")
@@ -262,7 +262,7 @@ void testDeleteGlobalPropertyNoName()
             throws Exception
     {
         RequestBody requestBody =
-                RequestBody.create(MediaType.parse("application/json; charset=utf-8"), "");
+                RequestBody.create("", MediaType.parse("application/json; charset=utf-8"));
         Request request =
                 new Request.Builder()
                         .url("http://localhost:" + routerPort + "/trino/globalproperty/delete/")

diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestAuthorization.java b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestAuthorization.java
@@ -101,7 +101,7 @@ private List<String> getRoles(String credentials)
     private Response makeRequest(Optional<String> credentials)
             throws IOException
     {
-        RequestBody emptyRequestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), "");
+        RequestBody emptyRequestBody = RequestBody.create("", MediaType.parse("application/json; charset=utf-8"));
         Request.Builder builder = new Request.Builder()
                 .url("http://localhost:" + routerPort + "/userinfo")
                 .post(emptyRequestBody);

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
@@ -81,7 +81,7 @@ void testSuccessfulCookieAuthentication()
                 .when(requestContext.getCookies())
                 .thenReturn(
                         Map.of(SessionCookie.OAUTH_ID_TOKEN,
-                                new Cookie(SessionCookie.OAUTH_ID_TOKEN, ID_TOKEN)));
+                                new Cookie.Builder(SessionCookie.OAUTH_ID_TOKEN).value(ID_TOKEN).build()));
         Mockito
                 .when(requestContext.getHeaders())
                 .thenReturn(new MultivaluedHashMap());

diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbLdapClient.java b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbLdapClient.java
@@ -50,7 +50,7 @@ final class TestLbLdapClient
     public void initMocks()
     {
         log.info("initializing test");
-        org.mockito.MockitoAnnotations.initMocks(this);
+        org.mockito.MockitoAnnotations.openMocks(this);
     }
 
     @AfterEach