This is an automated email from the ASF dual-hosted git repository. yuqi4733 pushed a commit to branch internal-main in repository https://gitbox.apache.org/repos/asf/gravitino.git
commit a15b5f0ee1315597c12aeb686651552fdd6032ce Author: roryqi <[email protected]> AuthorDate: Thu Dec 11 14:37:53 2025 +0800 [MINOR] improvement: Add more flexible rules (#9453) ### What changes were proposed in this pull request? Add more flexible rules. ### Why are the changes needed? Just a minor fix. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? No need. --- build.gradle.kts | 34 ++++++++-------------- .../hive/integration/test/CatalogHiveABSIT.java | 2 +- .../hive/integration/test/CatalogHiveGCSIT.java | 2 +- .../hive/integration/test/CatalogHiveS3IT.java | 2 +- .../apache/gravitino/catalog/jdbc/TestJdbc.java | 2 +- .../operation/TestPostgreSqlSchemaOperations.java | 2 +- .../operation/TestPostgreSqlTableOperations.java | 2 +- .../java/org/apache/gravitino/cli/TestCliUtil.java | 2 +- .../apache/gravitino/cli/TestModelCommands.java | 2 +- .../gravitino/cli/output/TestPlainFormat.java | 4 +-- .../authorization/BaseRestApiAuthorizationIT.java | 2 +- .../authorization/PermissionAuthorizationIT.java | 2 +- .../test/authorization/RoleAuthorizationIT.java | 4 +-- .../cache/it/AbstractEntityStorageBenchmark.java | 2 +- .../credential/TestCredentialCacheKey.java | 2 +- .../credential/TestCredentialProvider.java | 4 +-- .../gravitino/credential/TestCredentialUtils.java | 4 +-- .../listener/api/event/TestOwnerEvent.java | 2 +- .../relational/service/TestFilesetMetaService.java | 2 +- .../service/TestTableColumnMetaService.java | 2 +- .../integration/test/IcebergAuthorizationIT.java | 2 +- .../integration/test/TestIcebergExtendAPI.java | 2 +- .../util/IcebergRESTServerManagerForDeploy.java | 2 +- .../iceberg/service/TestCatalogWrapperForREST.java | 2 +- .../service/rest/CatalogWrapperForTest.java | 2 +- .../integration/test/container/KafkaContainer.java | 4 +-- .../test/container/TrinoITContainers.java | 2 +- .../lance/integration/test/LanceRESTServiceIT.java | 2 +- .../jdbc/mysql/MySQLTablePropertyConverter.java | 2 +- .../trino/connector/TestGravitinoConnector.java | 2 +- .../connector/util/TestDataTypeTransformer.java | 2 +- 31 files changed, 47 insertions(+), 57 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4f188a33ca..49a617e4f7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -130,34 +130,24 @@ allprojects { "$1" ) replaceRegex( - "Use Guava Sets instead of shadowed Glassfish Sets", - "import\\s+org\\.glassfish\\.jersey\\.internal\\.guava\\.Sets;", - "import com.google.common.collect.Sets;" + "Use Guava collect classes instead of any shadowed versions", + "import\\s+(?:.*\\.com\\.google\\.common\\.collect|org\\.glassfish\\.jersey\\.internal\\.guava)\\.(Sets|Maps|Lists|ImmutableList|ImmutableMap|ImmutableSet|ImmutableBiMap|Iterables|Iterators|Multimap|SetMultimap|ListMultimap|BiMap|Table);", + "import com.google.common.collect.${'$'}1;" ) replaceRegex( - "Use Guava Maps instead of shadowed Glassfish Maps", - "import\\s+org\\.glassfish\\.jersey\\.internal\\.guava\\.Maps;", - "import com.google.common.collect.Maps;" + "Use Guava base classes instead of any shadowed versions", + "import\\s+(?:.*\\.com\\.google\\.common\\.base|org\\.glassfish\\.jersey\\.internal\\.guava)\\.(Preconditions|Strings|Optional|Predicate|Function|Supplier|Joiner|Splitter|Objects);", + "import com.google.common.base.${'$'}1;" ) replaceRegex( - "Use Guava Lists instead of shadowed Glassfish Lists", - "import\\s+org\\.glassfish\\.jersey\\.internal\\.guava\\.Lists;", - "import com.google.common.collect.Lists;" + "Use Guava io classes instead of any shadowed versions", + "import\\s+.*\\.com\\.google\\.common\\.io\\.(Files|Resources|ByteStreams|CharStreams);", + "import com.google.common.io.${'$'}1;" ) replaceRegex( - "Use Guava Sets instead of shadowed Avro Sets", - "import\\s+org\\.apache\\.avro\\.shaded\\.com\\.google\\.common\\.collect\\.Sets;", - "import com.google.common.collect.Sets;" - ) - replaceRegex( - "Use Guava Maps instead of shadowed Avro Maps", - "import\\s+org\\.apache\\.avro\\.shaded\\.com\\.google\\.common\\.collect\\.Maps;", - "import com.google.common.collect.Maps;" - ) - replaceRegex( - "Use Guava Lists instead of shadowed Avro Lists", - "import\\s+org\\.apache\\.avro\\.shaded\\.com\\.google\\.common\\.collect\\.Lists;", - "import com.google.common.collect.Lists;" + "Use Guava util.concurrent classes instead of any shadowed versions", + "import\\s+.*\\.com\\.google\\.common\\.util\\.concurrent\\.(ListenableFuture|Futures|MoreExecutors);", + "import com.google.common.util.concurrent.${'$'}1;" ) targetExclude("**/build/**", "**/.pnpm/***") diff --git a/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveABSIT.java b/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveABSIT.java index aaf44dae52..4f50aeaf80 100644 --- a/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveABSIT.java +++ b/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveABSIT.java @@ -18,6 +18,7 @@ */ package org.apache.gravitino.catalog.hive.integration.test; +import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.net.URI; import java.util.HashMap; @@ -29,7 +30,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.spark.sql.SparkSession; import org.junit.jupiter.api.condition.EnabledIf; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; // Apart from the following dependencies on environment, this test also needs hadoop3-common, please // refer to L135 in the file `${GRAVITINO_HOME}/catalogs/catalog-hive/build.gradle.kts`, otherwise diff --git a/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveGCSIT.java b/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveGCSIT.java index c69cf013ee..343c3fd387 100644 --- a/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveGCSIT.java +++ b/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveGCSIT.java @@ -19,6 +19,7 @@ package org.apache.gravitino.catalog.hive.integration.test; +import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.net.URI; import java.util.HashMap; @@ -29,7 +30,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.spark.sql.SparkSession; import org.junit.jupiter.api.condition.EnabledIf; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; import org.testcontainers.utility.MountableFile; @EnabledIf(value = "isGCSConfigured", disabledReason = "Google Cloud Storage(GCS) is not prepared.") diff --git a/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveS3IT.java b/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveS3IT.java index 83d52d2411..20265b8135 100644 --- a/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveS3IT.java +++ b/catalogs/catalog-hive/src/test/java/org/apache/gravitino/catalog/hive/integration/test/CatalogHiveS3IT.java @@ -18,6 +18,7 @@ */ package org.apache.gravitino.catalog.hive.integration.test; +import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.net.URI; import java.util.HashMap; @@ -31,7 +32,6 @@ import org.apache.spark.sql.SparkSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.Container; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; import org.testcontainers.shaded.org.awaitility.Awaitility; public class CatalogHiveS3IT extends CatalogHiveIT { diff --git a/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/TestJdbc.java b/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/TestJdbc.java index 54535160e3..a34b77ea78 100644 --- a/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/TestJdbc.java +++ b/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/TestJdbc.java @@ -20,6 +20,7 @@ package org.apache.gravitino.catalog.jdbc; import static org.apache.gravitino.dto.util.DTOConverters.toDTO; +import com.google.common.collect.Maps; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -44,7 +45,6 @@ import org.apache.gravitino.utils.RandomNameUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.testcontainers.containers.JdbcDatabaseContainer; -import org.testcontainers.shaded.com.google.common.collect.Maps; public abstract class TestJdbc { protected static JdbcDatabaseContainer<?> CONTAINER; diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java b/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java index 8ccf5902f0..ff557b38ec 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlSchemaOperations.java @@ -18,6 +18,7 @@ */ package org.apache.gravitino.catalog.postgresql.operation; +import com.google.common.collect.Maps; import java.sql.Connection; import java.sql.SQLException; import java.util.HashMap; @@ -34,7 +35,6 @@ import org.apache.gravitino.utils.RandomNameUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.collect.Maps; @Tag("gravitino-docker-test") public class TestPostgreSqlSchemaOperations extends TestPostgreSql { diff --git a/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlTableOperations.java b/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlTableOperations.java index 5d2d54615a..fb6b1a1fa8 100644 --- a/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlTableOperations.java +++ b/catalogs/catalog-jdbc-postgresql/src/test/java/org/apache/gravitino/catalog/postgresql/operation/TestPostgreSqlTableOperations.java @@ -18,6 +18,7 @@ */ package org.apache.gravitino.catalog.postgresql.operation; +import com.google.common.collect.Maps; import java.sql.Connection; import java.sql.SQLException; import java.util.ArrayList; @@ -48,7 +49,6 @@ import org.apache.gravitino.utils.RandomNameUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.collect.Maps; @Tag("gravitino-docker-test") public class TestPostgreSqlTableOperations extends TestPostgreSql { diff --git a/clients/cli/src/test/java/org/apache/gravitino/cli/TestCliUtil.java b/clients/cli/src/test/java/org/apache/gravitino/cli/TestCliUtil.java index 042d8e5ca4..ff97a4072c 100644 --- a/clients/cli/src/test/java/org/apache/gravitino/cli/TestCliUtil.java +++ b/clients/cli/src/test/java/org/apache/gravitino/cli/TestCliUtil.java @@ -23,6 +23,7 @@ import static org.apache.gravitino.rel.Column.DEFAULT_VALUE_NOT_SET; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import java.util.List; import java.util.Map; @@ -43,7 +44,6 @@ import org.apache.gravitino.rel.expressions.Expression; import org.apache.gravitino.rel.types.Type; import org.apache.gravitino.rel.types.Types; import org.apache.gravitino.tag.Tag; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; public class TestCliUtil { private TestCliUtil() { diff --git a/clients/cli/src/test/java/org/apache/gravitino/cli/TestModelCommands.java b/clients/cli/src/test/java/org/apache/gravitino/cli/TestModelCommands.java index a3102c1261..c0ba5c42ac 100644 --- a/clients/cli/src/test/java/org/apache/gravitino/cli/TestModelCommands.java +++ b/clients/cli/src/test/java/org/apache/gravitino/cli/TestModelCommands.java @@ -32,6 +32,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -59,7 +60,6 @@ import org.apache.gravitino.cli.commands.UpdateModelVersionUri; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.base.Joiner; public class TestModelCommands { private final Joiner joiner = Joiner.on(", ").skipNulls(); diff --git a/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestPlainFormat.java b/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestPlainFormat.java index 5e45167f5f..e773031a2c 100644 --- a/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestPlainFormat.java +++ b/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestPlainFormat.java @@ -23,6 +23,8 @@ import static org.junit.Assert.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.nio.charset.StandardCharsets; @@ -50,8 +52,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; public class TestPlainFormat { diff --git a/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/BaseRestApiAuthorizationIT.java b/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/BaseRestApiAuthorizationIT.java index f20e4e83d2..488d3c4208 100644 --- a/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/BaseRestApiAuthorizationIT.java +++ b/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/BaseRestApiAuthorizationIT.java @@ -17,6 +17,7 @@ package org.apache.gravitino.client.integration.test.authorization; +import com.google.common.collect.ImmutableMap; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -29,7 +30,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; public class BaseRestApiAuthorizationIT extends BaseIT { diff --git a/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/PermissionAuthorizationIT.java b/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/PermissionAuthorizationIT.java index 4f586d669a..0bfab6c331 100644 --- a/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/PermissionAuthorizationIT.java +++ b/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/PermissionAuthorizationIT.java @@ -19,6 +19,7 @@ package org.apache.gravitino.client.integration.test.authorization; import static org.junit.Assert.assertThrows; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.util.Collections; import java.util.HashMap; @@ -29,7 +30,6 @@ import org.apache.gravitino.client.GravitinoMetalake; import org.apache.gravitino.exceptions.ForbiddenException; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; @Tag("gravitino-docker-test") public class PermissionAuthorizationIT extends BaseRestApiAuthorizationIT { diff --git a/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/RoleAuthorizationIT.java b/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/RoleAuthorizationIT.java index e599651597..536fe9d928 100644 --- a/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/RoleAuthorizationIT.java +++ b/clients/client-java/src/test/java/org/apache/gravitino/client/integration/test/authorization/RoleAuthorizationIT.java @@ -20,6 +20,8 @@ package org.apache.gravitino.client.integration.test.authorization; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertThrows; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import java.lang.reflect.Method; import java.util.Arrays; @@ -36,8 +38,6 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; -import org.testcontainers.shaded.com.google.common.collect.ImmutableSet; @Tag("gravitino-docker-test") @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/core/src/jmh/java/org/apache/gravitino/cache/it/AbstractEntityStorageBenchmark.java b/core/src/jmh/java/org/apache/gravitino/cache/it/AbstractEntityStorageBenchmark.java index a7f17709e7..d55119a152 100644 --- a/core/src/jmh/java/org/apache/gravitino/cache/it/AbstractEntityStorageBenchmark.java +++ b/core/src/jmh/java/org/apache/gravitino/cache/it/AbstractEntityStorageBenchmark.java @@ -35,6 +35,7 @@ import static org.apache.gravitino.Configs.VERSION_RETENTION_COUNT; import static org.mockito.Mockito.mock; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import java.io.File; import java.io.IOException; @@ -82,7 +83,6 @@ import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; /** * Benchmark base class for evaluating {@code EntityStorage} performance using JMH. diff --git a/core/src/test/java/org/apache/gravitino/credential/TestCredentialCacheKey.java b/core/src/test/java/org/apache/gravitino/credential/TestCredentialCacheKey.java index 76e9deab77..75fc9ae2dd 100644 --- a/core/src/test/java/org/apache/gravitino/credential/TestCredentialCacheKey.java +++ b/core/src/test/java/org/apache/gravitino/credential/TestCredentialCacheKey.java @@ -19,10 +19,10 @@ package org.apache.gravitino.credential; +import com.google.common.collect.ImmutableSet; import java.util.Set; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableSet; public class TestCredentialCacheKey { diff --git a/core/src/test/java/org/apache/gravitino/credential/TestCredentialProvider.java b/core/src/test/java/org/apache/gravitino/credential/TestCredentialProvider.java index b419375b13..feffca59c7 100644 --- a/core/src/test/java/org/apache/gravitino/credential/TestCredentialProvider.java +++ b/core/src/test/java/org/apache/gravitino/credential/TestCredentialProvider.java @@ -19,12 +19,12 @@ package org.apache.gravitino.credential; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import java.util.Map; import org.apache.gravitino.credential.DummyCredentialProvider.DummyCredential; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; -import org.testcontainers.shaded.com.google.common.collect.ImmutableSet; public class TestCredentialProvider { @Test diff --git a/core/src/test/java/org/apache/gravitino/credential/TestCredentialUtils.java b/core/src/test/java/org/apache/gravitino/credential/TestCredentialUtils.java index c31affdc15..7f5ff6e702 100644 --- a/core/src/test/java/org/apache/gravitino/credential/TestCredentialUtils.java +++ b/core/src/test/java/org/apache/gravitino/credential/TestCredentialUtils.java @@ -19,12 +19,12 @@ package org.apache.gravitino.credential; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import java.util.Map; import java.util.Set; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; -import org.testcontainers.shaded.com.google.common.collect.ImmutableSet; public class TestCredentialUtils { diff --git a/core/src/test/java/org/apache/gravitino/listener/api/event/TestOwnerEvent.java b/core/src/test/java/org/apache/gravitino/listener/api/event/TestOwnerEvent.java index 231c08653c..4f2c597b38 100644 --- a/core/src/test/java/org/apache/gravitino/listener/api/event/TestOwnerEvent.java +++ b/core/src/test/java/org/apache/gravitino/listener/api/event/TestOwnerEvent.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; +import com.google.common.collect.ImmutableList; import java.util.Arrays; import java.util.List; import org.apache.gravitino.EntityStore; @@ -43,7 +44,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; import org.mockito.Mockito; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; @TestInstance(Lifecycle.PER_CLASS) public class TestOwnerEvent { diff --git a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java index 01bf11929b..93cc6d63ae 100644 --- a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java +++ b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java @@ -25,6 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import java.io.IOException; import java.sql.Connection; @@ -54,7 +55,6 @@ import org.apache.ibatis.session.SqlSession; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestTemplate; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Pair; public class TestFilesetMetaService extends TestJDBCBackend { diff --git a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestTableColumnMetaService.java b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestTableColumnMetaService.java index 1c138917c4..528db047e5 100644 --- a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestTableColumnMetaService.java +++ b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestTableColumnMetaService.java @@ -18,6 +18,7 @@ */ package org.apache.gravitino.storage.relational.service; +import com.google.common.collect.Lists; import java.io.IOException; import java.sql.Connection; import java.sql.PreparedStatement; @@ -42,7 +43,6 @@ import org.apache.gravitino.storage.relational.po.ColumnPO; import org.apache.gravitino.storage.relational.session.SqlSessions; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.TestTemplate; -import org.testcontainers.shaded.com.google.common.collect.Lists; public class TestTableColumnMetaService extends TestJDBCBackend { diff --git a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/IcebergAuthorizationIT.java b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/IcebergAuthorizationIT.java index 0c28bb0b7e..eb20d4672e 100644 --- a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/IcebergAuthorizationIT.java +++ b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/IcebergAuthorizationIT.java @@ -20,6 +20,7 @@ package org.apache.gravitino.iceberg.integration.test; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.errorprone.annotations.FormatMethod; import java.io.IOException; @@ -55,7 +56,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; /** * This IT starts a Gravitino server with Iceberg REST server in the auxiliary mode, we could create diff --git a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/TestIcebergExtendAPI.java b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/TestIcebergExtendAPI.java index 497257743d..35e15ce7bf 100644 --- a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/TestIcebergExtendAPI.java +++ b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/TestIcebergExtendAPI.java @@ -19,6 +19,7 @@ package org.apache.gravitino.iceberg.integration.test; +import com.google.common.collect.ImmutableMap; import java.util.HashMap; import java.util.Map; import org.apache.gravitino.iceberg.common.IcebergConfig; @@ -39,7 +40,6 @@ import org.junit.jupiter.api.TestInstance.Lifecycle; import org.junit.jupiter.api.condition.EnabledIf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; @TestInstance(Lifecycle.PER_CLASS) // We couldn't add REST extension package jar in deploy mode, so just test embedded mode. diff --git a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/util/IcebergRESTServerManagerForDeploy.java b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/util/IcebergRESTServerManagerForDeploy.java index ca4ba0cc41..943acde5c7 100644 --- a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/util/IcebergRESTServerManagerForDeploy.java +++ b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/integration/test/util/IcebergRESTServerManagerForDeploy.java @@ -18,6 +18,7 @@ */ package org.apache.gravitino.iceberg.integration.test.util; +import com.google.common.collect.ImmutableMap; import java.io.File; import java.nio.charset.StandardCharsets; import java.nio.file.Path; @@ -30,7 +31,6 @@ import org.apache.gravitino.integration.test.util.CommandExecutor; import org.apache.gravitino.integration.test.util.DownloaderUtils; import org.apache.gravitino.integration.test.util.ProcessData; import org.apache.gravitino.integration.test.util.ProcessData.TypesOfData; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; public class IcebergRESTServerManagerForDeploy extends IcebergRESTServerManager { diff --git a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/TestCatalogWrapperForREST.java b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/TestCatalogWrapperForREST.java index 809f65d048..65defc3ac4 100644 --- a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/TestCatalogWrapperForREST.java +++ b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/TestCatalogWrapperForREST.java @@ -19,10 +19,10 @@ package org.apache.gravitino.iceberg.service; +import com.google.common.collect.ImmutableMap; import java.util.Map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; public class TestCatalogWrapperForREST { diff --git a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/rest/CatalogWrapperForTest.java b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/rest/CatalogWrapperForTest.java index 64834e408c..89150a02c8 100644 --- a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/rest/CatalogWrapperForTest.java +++ b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/rest/CatalogWrapperForTest.java @@ -18,6 +18,7 @@ */ package org.apache.gravitino.iceberg.service.rest; +import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -38,7 +39,6 @@ import org.apache.iceberg.rest.requests.RegisterTableRequest; import org.apache.iceberg.rest.responses.LoadTableResponse; import org.apache.iceberg.types.Types.NestedField; import org.apache.iceberg.types.Types.StringType; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; // Used to override registerTable @SuppressWarnings("deprecation") diff --git a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/KafkaContainer.java b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/KafkaContainer.java index 7f027a3222..09ef6442e3 100644 --- a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/KafkaContainer.java +++ b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/KafkaContainer.java @@ -21,6 +21,8 @@ package org.apache.gravitino.integration.test.container; import static org.testcontainers.shaded.org.awaitility.Awaitility.await; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import java.net.Socket; import java.nio.file.Paths; import java.util.Map; @@ -32,8 +34,6 @@ import org.apache.logging.log4j.util.Strings; import org.testcontainers.containers.Container; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; -import org.testcontainers.shaded.com.google.common.collect.ImmutableSet; public class KafkaContainer extends BaseContainer { diff --git a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/TrinoITContainers.java b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/TrinoITContainers.java index 13e08b4369..cb1aed1d68 100644 --- a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/TrinoITContainers.java +++ b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/TrinoITContainers.java @@ -18,6 +18,7 @@ */ package org.apache.gravitino.integration.test.container; +import com.google.common.collect.ImmutableSet; import java.util.HashMap; import java.util.Map; import org.apache.gravitino.integration.test.util.CommandExecutor; @@ -27,7 +28,6 @@ import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.ContainerLaunchException; -import org.testcontainers.shaded.com.google.common.collect.ImmutableSet; public class TrinoITContainers implements AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(TrinoITContainers.class); diff --git a/lance/lance-rest-server/src/test/java/org/apache/gravitino/lance/integration/test/LanceRESTServiceIT.java b/lance/lance-rest-server/src/test/java/org/apache/gravitino/lance/integration/test/LanceRESTServiceIT.java index 3cdb773626..5570f38839 100644 --- a/lance/lance-rest-server/src/test/java/org/apache/gravitino/lance/integration/test/LanceRESTServiceIT.java +++ b/lance/lance-rest-server/src/test/java/org/apache/gravitino/lance/integration/test/LanceRESTServiceIT.java @@ -18,6 +18,7 @@ */ package org.apache.gravitino.lance.integration.test; +import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -82,7 +83,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.base.Joiner; public class LanceRESTServiceIT extends BaseIT { private static final String CATALOG_NAME = GravitinoITUtils.genRandomName("lance_rest_catalog"); diff --git a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/jdbc/mysql/MySQLTablePropertyConverter.java b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/jdbc/mysql/MySQLTablePropertyConverter.java index 3de0820c25..7c510b3e84 100644 --- a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/jdbc/mysql/MySQLTablePropertyConverter.java +++ b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/jdbc/mysql/MySQLTablePropertyConverter.java @@ -20,11 +20,11 @@ package org.apache.gravitino.trino.connector.catalog.jdbc.mysql; import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableMap; import java.util.Map; import org.apache.commons.collections4.bidimap.TreeBidiMap; import org.apache.gravitino.catalog.mysql.MysqlConstants; import org.apache.gravitino.catalog.property.PropertyConverter; -import org.apache.gravitino.shaded.com.google.common.collect.ImmutableMap; /** * Property converter for MySQL table properties. Handles the conversion of property keys between diff --git a/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/TestGravitinoConnector.java b/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/TestGravitinoConnector.java index e10f6be68f..30ac739009 100644 --- a/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/TestGravitinoConnector.java +++ b/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/TestGravitinoConnector.java @@ -23,6 +23,7 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; +import com.google.common.base.Preconditions; import io.trino.Session; import io.trino.plugin.memory.MemoryPlugin; import io.trino.testing.AbstractTestQueryFramework; @@ -39,7 +40,6 @@ import org.apache.gravitino.client.GravitinoAdminClient; import org.apache.gravitino.trino.connector.catalog.CatalogConnectorManager; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.base.Preconditions; public class TestGravitinoConnector extends AbstractTestQueryFramework { diff --git a/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/util/TestDataTypeTransformer.java b/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/util/TestDataTypeTransformer.java index 777713b98d..a073c2273a 100644 --- a/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/util/TestDataTypeTransformer.java +++ b/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/util/TestDataTypeTransformer.java @@ -21,6 +21,7 @@ package org.apache.gravitino.trino.connector.util; import static org.apache.gravitino.trino.connector.GravitinoErrorCode.GRAVITINO_UNSUPPORTED_GRAVITINO_DATATYPE; import static org.apache.gravitino.trino.connector.GravitinoErrorCode.GRAVITINO_UNSUPPORTED_TRINO_DATATYPE; +import com.google.common.collect.ImmutableList; import io.trino.spi.TrinoException; import io.trino.spi.type.ArrayType; import io.trino.spi.type.BigintType; @@ -47,7 +48,6 @@ import java.util.Optional; import org.apache.gravitino.rel.types.Types; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; public class TestDataTypeTransformer {
