Remove okhttp from Pinot connector

trinodb · Mar 8, 2024 · fdb124e · fdb124e
1 parent 66eede0
commit fdb124e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/plugin/trino-pinot/pom.xml b/plugin/trino-pinot/pom.xml
@@ -53,18 +53,6 @@
             <artifactId>protobuf-java</artifactId>
         </dependency>
 
-        <!-- Used for basic authentication only -->
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>

diff --git a/...rc/main/java/io/trino/plugin/pinot/auth/password/PinotPasswordAuthenticationProvider.java b/...rc/main/java/io/trino/plugin/pinot/auth/password/PinotPasswordAuthenticationProvider.java
@@ -14,11 +14,11 @@
 package io.trino.plugin.pinot.auth.password;
 
 import io.trino.plugin.pinot.auth.PinotAuthenticationProvider;
-import okhttp3.Credentials;
 
-import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Optional;
 
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static java.util.Objects.requireNonNull;
 
 public class PinotPasswordAuthenticationProvider
@@ -39,8 +39,8 @@ public Optional<String> getAuthenticationToken()
         return authToken;
     }
 
-    private String encode(String username, String password)
+    public static String encode(String username, String password)
     {
-        return Credentials.basic(username, password, StandardCharsets.ISO_8859_1);
+        return "Basic " + Base64.getEncoder().encodeToString((username + ":" + password).getBytes(ISO_8859_1));
     }
 }
diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestingPinotCluster.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/TestingPinotCluster.java
@@ -25,7 +25,7 @@
 import io.airlift.http.client.StaticBodyGenerator;
 import io.airlift.http.client.jetty.JettyHttpClient;
 import io.airlift.json.JsonCodec;
-import okhttp3.Credentials;
+import io.trino.plugin.pinot.auth.password.PinotPasswordAuthenticationProvider;
 import org.apache.http.Header;
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicHeader;
@@ -45,7 +45,6 @@
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -308,7 +307,7 @@ private static <T> T doWithRetries(Supplier<T> supplier, int retries)
     private static String controllerAuthToken()
     {
         // Secrets defined in pinot-controller-secured.conf
-        return Credentials.basic("admin", "verysecret", StandardCharsets.ISO_8859_1);
+        return PinotPasswordAuthenticationProvider.encode("admin", "verysecret");
     }
 
     public static class PinotSuccessResponse