This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch branch-1.1
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/branch-1.1 by this push:
new bc2c384e31 [MINOR] improvement: fix typos of guava imports (#9432)
bc2c384e31 is described below
commit bc2c384e317e4c938fd4d653c4cbfefadd2f2e8a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Dec 10 11:08:29 2025 +0800
[MINOR] improvement: fix typos of guava imports (#9432)
### What changes were proposed in this pull request?
Some `Sets` in the project are pointed to the shadowed one in Glassfish,
rather than original Guava.
1. Search through the project to replace all `import
org.glassfish.jersey.internal.guava.Xxss` to its corresponding
`com.google.common.collect.Xxxs`.
2. Add 3 `replaceRegex` actions to Spotless plugin, to ensure no similar
issues in the future.
### Why are the changes needed?
For sure the one from original Guava should be preferred, because
shadowed classes are normally used for internal purposes of the party
who package them, and are not intended to expose as a contract.
Fix: No functionality issue involved.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Unit tests all passed. Plus, the implementations of two classes are
identical, so in fact as long as it compiles right, we are good to go I
believe.
Co-authored-by: Floyd Maan <[email protected]>
Co-authored-by: wancheng.aliyun <[email protected]>
---
.../ranger/integration/test/RangerHiveIT.java | 2 +-
build.gradle.kts | 15 +++++++++++++++
.../apache/gravitino/authorization/PermissionManager.java | 2 +-
.../server/web/rest/MetadataObjectPolicyOperations.java | 2 +-
.../server/web/rest/MetadataObjectTagOperations.java | 2 +-
5 files changed, 19 insertions(+), 4 deletions(-)
diff --git
a/authorizations/authorization-ranger/src/test/java/org/apache/gravitino/authorization/ranger/integration/test/RangerHiveIT.java
b/authorizations/authorization-ranger/src/test/java/org/apache/gravitino/authorization/ranger/integration/test/RangerHiveIT.java
index 8857d4e507..5c159c8f3d 100644
---
a/authorizations/authorization-ranger/src/test/java/org/apache/gravitino/authorization/ranger/integration/test/RangerHiveIT.java
+++
b/authorizations/authorization-ranger/src/test/java/org/apache/gravitino/authorization/ranger/integration/test/RangerHiveIT.java
@@ -28,6 +28,7 @@ import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
@@ -66,7 +67,6 @@ import org.apache.gravitino.meta.UserEntity;
import org.apache.ranger.RangerServiceException;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerRole;
-import org.glassfish.jersey.internal.guava.Sets;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
diff --git a/build.gradle.kts b/build.gradle.kts
index 1054519056..92e27d2955 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -129,6 +129,21 @@ allprojects {
"import\\s+(?:static\\s+)?[^*\\s]+\\*;(\\r\\n|\\r|\\n)",
"$1"
)
+ replaceRegex(
+ "Use Guava Sets instead of shadowed Glassfish Sets",
+ "import\\s+org\\.glassfish\\.jersey\\.internal\\.guava\\.Sets;",
+ "import com.google.common.collect.Sets;"
+ )
+ replaceRegex(
+ "Use Guava Maps instead of shadowed Glassfish Maps",
+ "import\\s+org\\.glassfish\\.jersey\\.internal\\.guava\\.Maps;",
+ "import com.google.common.collect.Maps;"
+ )
+ replaceRegex(
+ "Use Guava Lists instead of shadowed Glassfish Lists",
+ "import\\s+org\\.glassfish\\.jersey\\.internal\\.guava\\.Lists;",
+ "import com.google.common.collect.Lists;"
+ )
targetExclude("**/build/**", "**/.pnpm/***")
}
diff --git
a/core/src/main/java/org/apache/gravitino/authorization/PermissionManager.java
b/core/src/main/java/org/apache/gravitino/authorization/PermissionManager.java
index 60fac44fd8..dff9f0747e 100644
---
a/core/src/main/java/org/apache/gravitino/authorization/PermissionManager.java
+++
b/core/src/main/java/org/apache/gravitino/authorization/PermissionManager.java
@@ -24,6 +24,7 @@ import static
org.apache.gravitino.authorization.AuthorizationUtils.USER_DOES_NO
import static
org.apache.gravitino.authorization.AuthorizationUtils.filterSecurableObjects;
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import java.io.IOException;
import java.time.Instant;
import java.util.List;
@@ -46,7 +47,6 @@ import org.apache.gravitino.meta.GroupEntity;
import org.apache.gravitino.meta.RoleEntity;
import org.apache.gravitino.meta.UserEntity;
import org.apache.gravitino.utils.PrincipalUtils;
-import org.glassfish.jersey.internal.guava.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/server/src/main/java/org/apache/gravitino/server/web/rest/MetadataObjectPolicyOperations.java
b/server/src/main/java/org/apache/gravitino/server/web/rest/MetadataObjectPolicyOperations.java
index 9af1682477..1ee876d665 100644
---
a/server/src/main/java/org/apache/gravitino/server/web/rest/MetadataObjectPolicyOperations.java
+++
b/server/src/main/java/org/apache/gravitino/server/web/rest/MetadataObjectPolicyOperations.java
@@ -22,6 +22,7 @@ import static
org.apache.gravitino.server.authorization.expression.Authorization
import com.codahale.metrics.annotation.ResponseMetered;
import com.codahale.metrics.annotation.Timed;
+import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collections;
import java.util.Locale;
@@ -60,7 +61,6 @@ import
org.apache.gravitino.server.authorization.annotations.AuthorizationReques
import
org.apache.gravitino.server.authorization.expression.AuthorizationExpressionConstants;
import org.apache.gravitino.server.web.Utils;
import org.apache.gravitino.utils.NameIdentifierUtil;
-import org.glassfish.jersey.internal.guava.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/server/src/main/java/org/apache/gravitino/server/web/rest/MetadataObjectTagOperations.java
b/server/src/main/java/org/apache/gravitino/server/web/rest/MetadataObjectTagOperations.java
index 18e268754c..abaa0e72ec 100644
---
a/server/src/main/java/org/apache/gravitino/server/web/rest/MetadataObjectTagOperations.java
+++
b/server/src/main/java/org/apache/gravitino/server/web/rest/MetadataObjectTagOperations.java
@@ -23,6 +23,7 @@ import static
org.apache.gravitino.server.authorization.expression.Authorization
import com.codahale.metrics.annotation.ResponseMetered;
import com.codahale.metrics.annotation.Timed;
+import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collections;
import java.util.Locale;
@@ -62,7 +63,6 @@ import org.apache.gravitino.server.web.Utils;
import org.apache.gravitino.tag.Tag;
import org.apache.gravitino.tag.TagDispatcher;
import org.apache.gravitino.utils.NameIdentifierUtil;
-import org.glassfish.jersey.internal.guava.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
