Avoid using shaded classes

trinodb · Aug 17, 2020 · 38ecc95 · 38ecc95
1 parent bdf22d9
commit 38ecc95
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 12 deletions.
diff --git a/presto-druid/pom.xml b/presto-druid/pom.xml
@@ -37,6 +37,11 @@
             <artifactId>guice</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>

diff --git a/presto-druid/src/test/java/io/prestosql/plugin/druid/TestingDruidServer.java b/presto-druid/src/test/java/io/prestosql/plugin/druid/TestingDruidServer.java
@@ -18,15 +18,15 @@
 import com.google.common.io.MoreFiles;
 import com.google.common.io.Resources;
 import io.prestosql.testing.assertions.Assert;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.shaded.okhttp3.OkHttpClient;
-import org.testcontainers.shaded.okhttp3.Request;
-import org.testcontainers.shaded.okhttp3.RequestBody;
-import org.testcontainers.shaded.okhttp3.Response;
 
 import java.io.Closeable;
 import java.io.File;

diff --git a/presto-jdbc/src/test/java/io/prestosql/jdbc/TestJdbcResultSetTimezone.java b/presto-jdbc/src/test/java/io/prestosql/jdbc/TestJdbcResultSetTimezone.java
@@ -13,14 +13,14 @@
  */
 package io.prestosql.jdbc;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Closer;
 import io.airlift.log.Logger;
 import io.airlift.log.Logging;
 import io.prestosql.server.testing.TestingPrestoServer;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;

diff --git a/presto-kudu/src/main/java/io/prestosql/plugin/kudu/properties/KuduTableProperties.java b/presto-kudu/src/main/java/io/prestosql/plugin/kudu/properties/KuduTableProperties.java
@@ -14,7 +14,9 @@
 package io.prestosql.plugin.kudu.properties;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterators;
 import io.prestosql.spi.PrestoException;
 import io.prestosql.spi.session.PropertyMetadata;
 import io.prestosql.spi.type.ArrayType;
@@ -27,8 +29,6 @@
 import org.apache.kudu.client.PartialRow;
 import org.apache.kudu.client.Partition;
 import org.apache.kudu.client.PartitionSchema;
-import org.apache.kudu.shaded.com.google.common.base.Predicates;
-import org.apache.kudu.shaded.com.google.common.collect.Iterators;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.ISODateTimeFormat;
 

diff --git a/presto-oracle/src/test/java/io/prestosql/plugin/oracle/BaseOracleIntegrationSmokeTest.java b/presto-oracle/src/test/java/io/prestosql/plugin/oracle/BaseOracleIntegrationSmokeTest.java
@@ -13,11 +13,11 @@
  */
 package io.prestosql.plugin.oracle;
 
+import com.google.common.collect.ImmutableList;
 import io.prestosql.testing.AbstractTestIntegrationSmokeTest;
 import io.prestosql.testing.MaterializedResult;
 import io.prestosql.testing.QueryRunner;
 import io.prestosql.tpch.TpchTable;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 

diff --git a/...roduct-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/cli/Commands.java b/...roduct-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/cli/Commands.java
@@ -13,10 +13,10 @@
  */
 package io.prestosql.tests.product.launcher.cli;
 
+import com.google.common.collect.ImmutableList;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import io.airlift.bootstrap.Bootstrap;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
 
 import java.util.List;
 

diff --git a/...ct-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/env/Environments.java b/...ct-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/env/Environments.java
@@ -15,11 +15,11 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.google.common.base.CaseFormat;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.reflect.ClassPath;
 import io.airlift.log.Logger;
 import io.prestosql.tests.product.launcher.env.common.TestsEnvironment;
 import org.testcontainers.DockerClientFactory;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;

diff --git a/presto-server-rpm/pom.xml b/presto-server-rpm/pom.xml
@@ -44,6 +44,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>

diff --git a/presto-server-rpm/src/test/java/io/prestosql/server/rpm/ServerIT.java b/presto-server-rpm/src/test/java/io/prestosql/server/rpm/ServerIT.java
@@ -13,10 +13,10 @@
  */
 package io.prestosql.server.rpm;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableSet;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;