This is an automated email from the ASF dual-hosted git repository.
yuqi4733 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 92e4956536 [#8974] improve(*) Change checkNotNull in Gravitino to
checkArgument (#9221)
92e4956536 is described below
commit 92e495653663b6e93d9308db486cede01d5eda76
Author: Lord of Abyss <[email protected]>
AuthorDate: Tue Nov 25 14:18:40 2025 +0800
[#8974] improve(*) Change checkNotNull in Gravitino to checkArgument (#9221)
### What changes were proposed in this pull request?
This pull request globally replaces all instances of `checkNotNull` with
`checkArgument` across the Gravitino codebase. This change ensures
stricter and more accurate validation of parameters, and prevent throw
NPE.
### Why are the changes needed?
Fix: #8974
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
local test
---
.../gravitino/catalog/jdbc/JdbcCatalogOperations.java | 11 +++++------
.../catalog/jdbc/operation/SqliteDatabaseOperations.java | 3 ++-
.../java/org/apache/gravitino/cli/CommandContext.java | 2 +-
.../java/org/apache/gravitino/cli/TestCommandContext.java | 2 +-
.../org/apache/gravitino/client/GravitinoMetalake.java | 2 +-
.../main/java/org/apache/gravitino/client/HTTPClient.java | 2 +-
.../org/apache/gravitino/client/OAuth2ClientUtil.java | 2 +-
.../gravitino/credential/PathBasedCredentialContext.java | 6 +++---
.../main/java/org/apache/gravitino/dto/rel/ColumnDTO.java | 4 ++--
.../java/org/apache/gravitino/dto/rel/SortOrderDTO.java | 2 +-
.../apache/gravitino/dto/requests/TableUpdateRequest.java | 4 ++--
core/src/main/java/org/apache/gravitino/GravitinoEnv.java | 2 +-
.../src/main/java/org/apache/gravitino/UserPrincipal.java | 2 +-
.../gravitino/credential/CatalogCredentialContext.java | 2 +-
.../main/java/org/apache/gravitino/listener/EventBus.java | 4 ++--
.../org/apache/gravitino/utils/MetadataObjectUtil.java | 14 +++++++++-----
.../gravitino/flink/connector/catalog/BaseCatalog.java | 3 ++-
.../flink/connector/jdbc/GravitinoJdbcCatalogFactory.java | 4 ++--
.../flink/connector/jdbc/JdbcPropertiesConverter.java | 12 ++++++------
.../flink/connector/store/GravitinoCatalogStore.java | 8 +++-----
.../connector/store/GravitinoCatalogStoreFactory.java | 15 +++++++++------
.../flink/connector/integration/test/FlinkEnvIT.java | 6 +++---
.../integration/test/hive/FlinkHiveCatalogIT.java | 4 ++--
.../integration/test/iceberg/FlinkIcebergCatalogIT.java | 2 +-
.../integration/test/jdbc/FlinkJdbcMysqlCatalogIT.java | 4 ++--
.../integration/test/paimon/FlinkPaimonCatalogIT.java | 4 ++--
.../server/authorization/jcasbin/JcasbinAuthorizer.java | 2 +-
.../gravitino/trino/connector/GravitinoConnector.java | 7 ++++---
.../trino/connector/catalog/CatalogConnectorManager.java | 3 ++-
.../system/table/GravitinoSystemTableCatalog.java | 2 +-
.../trino/connector/TestGravitinoConnectorNullChecks.java | 4 ++--
31 files changed, 76 insertions(+), 68 deletions(-)
diff --git
a/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogOperations.java
b/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogOperations.java
index 7c505b08f5..130af8c695 100644
---
a/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogOperations.java
+++
b/catalogs/catalog-jdbc-common/src/main/java/org/apache/gravitino/catalog/jdbc/JdbcCatalogOperations.java
@@ -230,9 +230,9 @@ public class JdbcCatalogOperations implements
CatalogOperations, SupportsSchemas
public JdbcSchema createSchema(
NameIdentifier ident, String comment, Map<String, String> properties)
throws NoSuchCatalogException, SchemaAlreadyExistsException {
- StringIdentifier identifier =
- Preconditions.checkNotNull(
- StringIdentifier.fromProperties(properties),
GRAVITINO_ATTRIBUTE_DOES_NOT_EXIST_MSG);
+
+ StringIdentifier identifier = StringIdentifier.fromProperties(properties);
+ Preconditions.checkArgument(identifier != null,
GRAVITINO_ATTRIBUTE_DOES_NOT_EXIST_MSG);
String notAllowedKey =
properties.keySet().stream()
.filter(s -> !StringUtils.equals(s, StringIdentifier.ID_KEY))
@@ -434,9 +434,8 @@ public class JdbcCatalogOperations implements
CatalogOperations, SupportsSchemas
Preconditions.checkArgument(
null == sortOrders || sortOrders.length == 0, "jdbc-catalog does not
support sort orders");
- StringIdentifier identifier =
- Preconditions.checkNotNull(
- StringIdentifier.fromProperties(properties),
GRAVITINO_ATTRIBUTE_DOES_NOT_EXIST_MSG);
+ StringIdentifier identifier = StringIdentifier.fromProperties(properties);
+ Preconditions.checkArgument(identifier != null,
GRAVITINO_ATTRIBUTE_DOES_NOT_EXIST_MSG);
// The properties we write to the database do not require the id field, so
it needs to be
// removed.
HashMap<String, String> resultProperties =
diff --git
a/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/operation/SqliteDatabaseOperations.java
b/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/operation/SqliteDatabaseOperations.java
index 98f492a7ff..806bf9fcb8 100644
---
a/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/operation/SqliteDatabaseOperations.java
+++
b/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/operation/SqliteDatabaseOperations.java
@@ -43,7 +43,8 @@ public class SqliteDatabaseOperations extends
JdbcDatabaseOperations {
private String dbPath;
public SqliteDatabaseOperations(String baseFileDir) {
- this.dbPath = Preconditions.checkNotNull(baseFileDir);
+ Preconditions.checkArgument(baseFileDir != null, "Base file directory
cannot be null");
+ this.dbPath = baseFileDir;
}
@Override
diff --git
a/clients/cli/src/main/java/org/apache/gravitino/cli/CommandContext.java
b/clients/cli/src/main/java/org/apache/gravitino/cli/CommandContext.java
index 9e1d831f7d..457bf10c94 100644
--- a/clients/cli/src/main/java/org/apache/gravitino/cli/CommandContext.java
+++ b/clients/cli/src/main/java/org/apache/gravitino/cli/CommandContext.java
@@ -47,7 +47,7 @@ public class CommandContext {
* @param line The command line.
*/
public CommandContext(CommandLine line) {
- Preconditions.checkNotNull(line);
+ Preconditions.checkArgument(line != null, "line cannot be null");
this.line = line;
this.force = line.hasOption(GravitinoOptions.FORCE);
this.outputFormat =
diff --git
a/clients/cli/src/test/java/org/apache/gravitino/cli/TestCommandContext.java
b/clients/cli/src/test/java/org/apache/gravitino/cli/TestCommandContext.java
index 5bdd822b33..5ddad763a7 100644
--- a/clients/cli/src/test/java/org/apache/gravitino/cli/TestCommandContext.java
+++ b/clients/cli/src/test/java/org/apache/gravitino/cli/TestCommandContext.java
@@ -66,6 +66,6 @@ public class TestCommandContext {
@Test
public void testCreateCommandContextWithNull() {
- Assertions.assertThrows(NullPointerException.class, () -> new
CommandContext(null));
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new
CommandContext(null));
}
}
diff --git
a/clients/client-java/src/main/java/org/apache/gravitino/client/GravitinoMetalake.java
b/clients/client-java/src/main/java/org/apache/gravitino/client/GravitinoMetalake.java
index 9a61e04424..1d3c9c2a23 100644
---
a/clients/client-java/src/main/java/org/apache/gravitino/client/GravitinoMetalake.java
+++
b/clients/client-java/src/main/java/org/apache/gravitino/client/GravitinoMetalake.java
@@ -1596,7 +1596,7 @@ public class GravitinoMetalake extends MetalakeDTO
@Override
public GravitinoMetalake build() {
- Preconditions.checkNotNull(restClient, "restClient must be set");
+ Preconditions.checkArgument(restClient != null, "restClient must be
set");
Preconditions.checkArgument(StringUtils.isNotBlank(name), "name must not
be null or empty");
Preconditions.checkArgument(audit != null, "audit must not be null");
diff --git
a/clients/client-java/src/main/java/org/apache/gravitino/client/HTTPClient.java
b/clients/client-java/src/main/java/org/apache/gravitino/client/HTTPClient.java
index c1ae1a7f32..ba961fb296 100644
---
a/clients/client-java/src/main/java/org/apache/gravitino/client/HTTPClient.java
+++
b/clients/client-java/src/main/java/org/apache/gravitino/client/HTTPClient.java
@@ -765,7 +765,7 @@ public class HTTPClient implements RESTClient {
* @return This Builder instance for method chaining.
*/
public Builder uri(String baseUri) {
- Preconditions.checkNotNull(baseUri, "Invalid uri for http client: null");
+ Preconditions.checkArgument(baseUri != null, "Invalid uri for http
client: null");
this.uri = RESTUtils.stripTrailingSlash(baseUri);
return this;
}
diff --git
a/clients/client-java/src/main/java/org/apache/gravitino/client/OAuth2ClientUtil.java
b/clients/client-java/src/main/java/org/apache/gravitino/client/OAuth2ClientUtil.java
index b8d7319e5e..2b63afc89b 100644
---
a/clients/client-java/src/main/java/org/apache/gravitino/client/OAuth2ClientUtil.java
+++
b/clients/client-java/src/main/java/org/apache/gravitino/client/OAuth2ClientUtil.java
@@ -74,7 +74,7 @@ class OAuth2ClientUtil {
}
private static Pair<String, String> parseCredential(String credential) {
- Preconditions.checkNotNull(credential, "Invalid credential: null");
+ Preconditions.checkArgument(credential != null, "Invalid credential:
null");
List<String> parts = CREDENTIAL_SPLITTER.splitToList(credential);
switch (parts.size()) {
case 2:
diff --git
a/common/src/main/java/org/apache/gravitino/credential/PathBasedCredentialContext.java
b/common/src/main/java/org/apache/gravitino/credential/PathBasedCredentialContext.java
index 01da3e7520..eb6516389a 100644
---
a/common/src/main/java/org/apache/gravitino/credential/PathBasedCredentialContext.java
+++
b/common/src/main/java/org/apache/gravitino/credential/PathBasedCredentialContext.java
@@ -43,9 +43,9 @@ public class PathBasedCredentialContext implements
CredentialContext {
*/
public PathBasedCredentialContext(
String userName, Set<String> writePaths, Set<String> readPaths) {
- Preconditions.checkNotNull(userName, "User name should not be null");
- Preconditions.checkNotNull(writePaths, "Write paths should not be null");
- Preconditions.checkNotNull(readPaths, "Read paths should not be null");
+ Preconditions.checkArgument(userName != null, "User name should not be
null");
+ Preconditions.checkArgument(writePaths != null, "Write paths should not be
null");
+ Preconditions.checkArgument(readPaths != null, "Read paths should not be
null");
this.userName = userName;
this.writePaths = writePaths;
this.readPaths = readPaths;
diff --git a/common/src/main/java/org/apache/gravitino/dto/rel/ColumnDTO.java
b/common/src/main/java/org/apache/gravitino/dto/rel/ColumnDTO.java
index 4684cb6ce6..0b9ec6427a 100644
--- a/common/src/main/java/org/apache/gravitino/dto/rel/ColumnDTO.java
+++ b/common/src/main/java/org/apache/gravitino/dto/rel/ColumnDTO.java
@@ -229,8 +229,8 @@ public class ColumnDTO implements Column {
* @throws NullPointerException If required, fields name and data type are
not set.
*/
public ColumnDTO build() {
- Preconditions.checkNotNull(name, "Column name cannot be null");
- Preconditions.checkNotNull(dataType, "Column data type cannot be null");
+ Preconditions.checkArgument(name != null, "Column name cannot be null");
+ Preconditions.checkArgument(dataType != null, "Column data type cannot
be null");
return new ColumnDTO(name, dataType, comment, nullable, autoIncrement,
defaultValue);
}
}
diff --git
a/common/src/main/java/org/apache/gravitino/dto/rel/SortOrderDTO.java
b/common/src/main/java/org/apache/gravitino/dto/rel/SortOrderDTO.java
index 9c5632b873..3fe1ddd0b4 100644
--- a/common/src/main/java/org/apache/gravitino/dto/rel/SortOrderDTO.java
+++ b/common/src/main/java/org/apache/gravitino/dto/rel/SortOrderDTO.java
@@ -146,7 +146,7 @@ public class SortOrderDTO implements SortOrder {
// Default is by direction
this.nullOrdering = nullOrdering == null ?
direction.defaultNullOrdering() : nullOrdering;
- Preconditions.checkNotNull(this.sortTerm, "expression cannot be null");
+ Preconditions.checkArgument(this.sortTerm != null, "expression cannot be
null");
return new SortOrderDTO(sortTerm, direction, nullOrdering);
}
}
diff --git
a/common/src/main/java/org/apache/gravitino/dto/requests/TableUpdateRequest.java
b/common/src/main/java/org/apache/gravitino/dto/requests/TableUpdateRequest.java
index 4a1ce39934..e31e14033e 100644
---
a/common/src/main/java/org/apache/gravitino/dto/requests/TableUpdateRequest.java
+++
b/common/src/main/java/org/apache/gravitino/dto/requests/TableUpdateRequest.java
@@ -831,7 +831,7 @@ public interface TableUpdateRequest extends RESTRequest {
*/
@Override
public void validate() throws IllegalArgumentException {
- Preconditions.checkNotNull(index, "Index cannot be null");
+ Preconditions.checkArgument(index != null, "Index cannot be null");
Preconditions.checkArgument(index.type() != null, "Index type cannot be
null");
Preconditions.checkArgument(
index.fieldNames() != null && index.fieldNames().length > 0,
@@ -879,7 +879,7 @@ public interface TableUpdateRequest extends RESTRequest {
*/
@Override
public void validate() throws IllegalArgumentException {
- Preconditions.checkNotNull(name, "Index name cannot be null");
+ Preconditions.checkArgument(name != null, "Index name cannot be null");
}
/**
diff --git a/core/src/main/java/org/apache/gravitino/GravitinoEnv.java
b/core/src/main/java/org/apache/gravitino/GravitinoEnv.java
index fc37302436..68c74a0800 100644
--- a/core/src/main/java/org/apache/gravitino/GravitinoEnv.java
+++ b/core/src/main/java/org/apache/gravitino/GravitinoEnv.java
@@ -211,7 +211,7 @@ public class GravitinoEnv {
* @return The EntityStore instance.
*/
public EntityStore entityStore() {
- Preconditions.checkNotNull(entityStore, "GravitinoEnv is not
initialized.");
+ Preconditions.checkArgument(entityStore != null, "GravitinoEnv is not
initialized.");
return entityStore;
}
diff --git a/core/src/main/java/org/apache/gravitino/UserPrincipal.java
b/core/src/main/java/org/apache/gravitino/UserPrincipal.java
index c056f6fd0e..5f8b347742 100644
--- a/core/src/main/java/org/apache/gravitino/UserPrincipal.java
+++ b/core/src/main/java/org/apache/gravitino/UserPrincipal.java
@@ -27,7 +27,7 @@ public class UserPrincipal implements Principal {
private final String username;
public UserPrincipal(final String username) {
- Preconditions.checkNotNull(username, "UserPrincipal must have the
username");
+ Preconditions.checkArgument(username != null, "UserPrincipal must have the
username");
this.username = username;
}
diff --git
a/core/src/main/java/org/apache/gravitino/credential/CatalogCredentialContext.java
b/core/src/main/java/org/apache/gravitino/credential/CatalogCredentialContext.java
index 2a7955d08a..0f9fe04347 100644
---
a/core/src/main/java/org/apache/gravitino/credential/CatalogCredentialContext.java
+++
b/core/src/main/java/org/apache/gravitino/credential/CatalogCredentialContext.java
@@ -28,7 +28,7 @@ public class CatalogCredentialContext implements
CredentialContext {
@NotNull private final String userName;
public CatalogCredentialContext(String userName) {
- Preconditions.checkNotNull(userName, "User name should not be null");
+ Preconditions.checkArgument(userName != null, "User name should not be
null");
this.userName = userName;
}
diff --git a/core/src/main/java/org/apache/gravitino/listener/EventBus.java
b/core/src/main/java/org/apache/gravitino/listener/EventBus.java
index b0f34d03ba..5b78119cca 100644
--- a/core/src/main/java/org/apache/gravitino/listener/EventBus.java
+++ b/core/src/main/java/org/apache/gravitino/listener/EventBus.java
@@ -121,8 +121,8 @@ public class EventBus {
SupportsChangingPreEvent tmpPreEvent = preEvent;
for (EventListenerPlugin eventListener : eventListeners) {
tmpPreEvent = eventListener.transformPreEvent(tmpPreEvent);
- Preconditions.checkNotNull(
- tmpPreEvent,
+ Preconditions.checkArgument(
+ tmpPreEvent != null,
String.format("%s transformPreEvent return null",
getListenerName(eventListener)));
}
return tmpPreEvent;
diff --git
a/core/src/main/java/org/apache/gravitino/utils/MetadataObjectUtil.java
b/core/src/main/java/org/apache/gravitino/utils/MetadataObjectUtil.java
index fe67d06ae0..eb1ea37578 100644
--- a/core/src/main/java/org/apache/gravitino/utils/MetadataObjectUtil.java
+++ b/core/src/main/java/org/apache/gravitino/utils/MetadataObjectUtil.java
@@ -18,8 +18,6 @@
*/
package org.apache.gravitino.utils;
-import static com.google.common.base.Preconditions.checkNotNull;
-
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.BiMap;
@@ -192,7 +190,9 @@ public class MetadataObjectUtil {
try {
env.accessControlDispatcher().getRole(metalake, object.fullName());
} catch (NoSuchRoleException nsr) {
- throw checkNotNull(exceptionToThrowSupplier).get();
+ Preconditions.checkArgument(
+ exceptionToThrowSupplier != null, "exceptionToThrowSupplier
should not be null");
+ throw exceptionToThrowSupplier.get();
}
break;
case TAG:
@@ -200,7 +200,9 @@ public class MetadataObjectUtil {
try {
env.tagDispatcher().getTag(metalake, object.fullName());
} catch (NoSuchTagException nsr) {
- throw checkNotNull(exceptionToThrowSupplier).get();
+ Preconditions.checkArgument(
+ exceptionToThrowSupplier != null, "exceptionToThrowSupplier
should not be null");
+ throw exceptionToThrowSupplier.get();
}
break;
default:
@@ -212,7 +214,9 @@ public class MetadataObjectUtil {
private static void check(
final boolean expression, Supplier<? extends RuntimeException>
exceptionToThrowSupplier) {
if (!expression) {
- throw checkNotNull(exceptionToThrowSupplier).get();
+ Preconditions.checkArgument(
+ exceptionToThrowSupplier != null, "exceptionToThrowSupplier should
not be null");
+ throw exceptionToThrowSupplier.get();
}
}
}
diff --git
a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/BaseCatalog.java
b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/BaseCatalog.java
index 5a48c72795..6995096646 100644
---
a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/BaseCatalog.java
+++
b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/BaseCatalog.java
@@ -668,7 +668,8 @@ public abstract class BaseCatalog extends AbstractCatalog {
@VisibleForTesting
static TableChange[] getGravitinoTableChanges(
CatalogBaseTable existingTable, CatalogBaseTable newTable) {
- Preconditions.checkNotNull(newTable.getComment(), "The new comment should
not be null");
+ Preconditions.checkArgument(
+ newTable.getComment() != null, "The new comment should not be null");
List<TableChange> changes = Lists.newArrayList();
if (!Objects.equals(newTable.getComment(), existingTable.getComment())) {
changes.add(TableChange.updateComment(newTable.getComment()));
diff --git
a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/GravitinoJdbcCatalogFactory.java
b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/GravitinoJdbcCatalogFactory.java
index 8cfda0399f..b8090ac7b7 100644
---
a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/GravitinoJdbcCatalogFactory.java
+++
b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/GravitinoJdbcCatalogFactory.java
@@ -45,8 +45,8 @@ public abstract class GravitinoJdbcCatalogFactory implements
BaseCatalogFactory
FactoryUtils.createCatalogFactoryHelper(this, context);
String defaultDatabase =
helper.getOptions().get(GravitinoJdbcCatalogFactoryOptions.DEFAULT_DATABASE);
- Preconditions.checkNotNull(
- defaultDatabase,
+ Preconditions.checkArgument(
+ defaultDatabase != null,
GravitinoJdbcCatalogFactoryOptions.DEFAULT_DATABASE.key() + " should
not be null.");
return new GravitinoJdbcCatalog(
context, defaultDatabase, propertiesConverter(), partitionConverter());
diff --git
a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/JdbcPropertiesConverter.java
b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/JdbcPropertiesConverter.java
index b46d2cc1bf..99215f68bc 100644
---
a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/JdbcPropertiesConverter.java
+++
b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/JdbcPropertiesConverter.java
@@ -78,12 +78,12 @@ public abstract class JdbcPropertiesConverter implements
PropertiesConverter {
String jdbcUser =
flinkCatalogProperties.get(JdbcPropertiesConstants.FLINK_JDBC_USER);
String jdbcPassword =
flinkCatalogProperties.get(JdbcPropertiesConstants.FLINK_JDBC_PASSWORD);
String jdbcBaseUrl =
flinkCatalogProperties.get(JdbcPropertiesConstants.FLINK_JDBC_URL);
- Preconditions.checkNotNull(
- jdbcUser, JdbcPropertiesConstants.FLINK_JDBC_USER + " should not be
null.");
- Preconditions.checkNotNull(
- jdbcPassword, JdbcPropertiesConstants.FLINK_JDBC_PASSWORD + " should
not be null.");
- Preconditions.checkNotNull(
- jdbcBaseUrl, JdbcPropertiesConstants.FLINK_JDBC_URL + " should not be
null.");
+ Preconditions.checkArgument(
+ jdbcUser != null, JdbcPropertiesConstants.FLINK_JDBC_USER + " should
not be null.");
+ Preconditions.checkArgument(
+ jdbcPassword != null, JdbcPropertiesConstants.FLINK_JDBC_PASSWORD + "
should not be null.");
+ Preconditions.checkArgument(
+ jdbcBaseUrl != null, JdbcPropertiesConstants.FLINK_JDBC_URL + " should
not be null.");
Map<String, String> tableOptions = new HashMap<>();
tableOptions.put(
JdbcPropertiesConstants.FLINK_JDBC_TABLE_DATABASE_URL,
diff --git
a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/store/GravitinoCatalogStore.java
b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/store/GravitinoCatalogStore.java
index e1e95a3ef7..bee063e25a 100644
---
a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/store/GravitinoCatalogStore.java
+++
b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/store/GravitinoCatalogStore.java
@@ -125,11 +125,9 @@ public class GravitinoCatalogStore extends
AbstractCatalogStore {
}
private BaseCatalogFactory getCatalogFactory(Map<String, String>
configuration) {
- String catalogType =
- Preconditions.checkNotNull(
- configuration.get(CommonCatalogOptions.CATALOG_TYPE.key()),
- "%s should not be null.",
- CommonCatalogOptions.CATALOG_TYPE);
+ String catalogType =
configuration.get(CommonCatalogOptions.CATALOG_TYPE.key());
+ Preconditions.checkArgument(
+ catalogType != null, "%s should not be null.",
CommonCatalogOptions.CATALOG_TYPE.key());
return discoverFactories(
catalogFactory ->
(catalogFactory.factoryIdentifier().equalsIgnoreCase(catalogType)),
diff --git
a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/store/GravitinoCatalogStoreFactory.java
b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/store/GravitinoCatalogStoreFactory.java
index 39fa6ee8c6..b59b9cfc94 100644
---
a/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/store/GravitinoCatalogStoreFactory.java
+++
b/flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/store/GravitinoCatalogStoreFactory.java
@@ -56,12 +56,15 @@ public class GravitinoCatalogStoreFactory implements
CatalogStoreFactory {
factoryHelper.validate();
ReadableConfig options = factoryHelper.getOptions();
- String gravitinoUri =
- Preconditions.checkNotNull(
- options.get(GRAVITINO_URI), "The %s must be set.",
GRAVITINO_URI.key());
- String gravitinoName =
- Preconditions.checkNotNull(
- options.get(GRAVITINO_METALAKE), "The %s must be set.",
GRAVITINO_METALAKE.key());
+
+ String gravitinoUri = options.get(GRAVITINO_URI);
+ String gravitinoName = options.get(GRAVITINO_METALAKE);
+ Preconditions.checkArgument(
+ gravitinoUri != null && gravitinoName != null,
+ "Both %s and %s must be set",
+ GRAVITINO_URI.key(),
+ GRAVITINO_METALAKE.key());
+
this.catalogManager =
GravitinoCatalogManager.create(gravitinoUri, gravitinoName,
extractClientConfig(options));
}
diff --git
a/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/FlinkEnvIT.java
b/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/FlinkEnvIT.java
index 57b029b6ee..404d220aea 100644
---
a/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/FlinkEnvIT.java
+++
b/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/FlinkEnvIT.java
@@ -231,8 +231,8 @@ public abstract class FlinkEnvIT extends BaseIT {
Consumer<Catalog> action,
boolean dropSchema,
boolean cascade) {
- Preconditions.checkNotNull(catalog);
- Preconditions.checkNotNull(schemaName);
+ Preconditions.checkArgument(catalog != null, "Catalog cannot be null");
+ Preconditions.checkArgument(schemaName != null, "Schema name cannot be
null");
try {
tableEnv.useCatalog(catalog.name());
if (!catalog.asSchemas().schemaExists(schemaName)) {
@@ -253,7 +253,7 @@ public abstract class FlinkEnvIT extends BaseIT {
}
protected static void doWithCatalog(Catalog catalog, Consumer<Catalog>
action) {
- Preconditions.checkNotNull(catalog);
+ Preconditions.checkArgument(catalog != null, "Catalog cannot be null");
tableEnv.useCatalog(catalog.name());
action.accept(catalog);
}
diff --git
a/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/hive/FlinkHiveCatalogIT.java
b/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/hive/FlinkHiveCatalogIT.java
index 1b9d321370..8274d166eb 100644
---
a/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/hive/FlinkHiveCatalogIT.java
+++
b/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/hive/FlinkHiveCatalogIT.java
@@ -82,12 +82,12 @@ public class FlinkHiveCatalogIT extends FlinkCommonIT {
@AfterAll
static void hiveStop() {
- Preconditions.checkNotNull(metalake);
+ Preconditions.checkArgument(metalake != null, "metalake should not be
null");
metalake.dropCatalog(DEFAULT_HIVE_CATALOG, true);
}
protected void initDefaultHiveCatalog() {
- Preconditions.checkNotNull(metalake);
+ Preconditions.checkArgument(metalake != null, "metalake should not be
null");
hiveCatalog =
metalake.createCatalog(
DEFAULT_HIVE_CATALOG,
diff --git
a/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/iceberg/FlinkIcebergCatalogIT.java
b/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/iceberg/FlinkIcebergCatalogIT.java
index 25b1ec2f37..e21c911ccb 100644
---
a/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/iceberg/FlinkIcebergCatalogIT.java
+++
b/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/iceberg/FlinkIcebergCatalogIT.java
@@ -69,7 +69,7 @@ public abstract class FlinkIcebergCatalogIT extends
FlinkCommonIT {
@BeforeAll
public void before() {
- Preconditions.checkNotNull(metalake);
+ Preconditions.checkArgument(metalake != null, "metalake should not be
null");
icebergCatalog =
metalake.createCatalog(
DEFAULT_ICEBERG_CATALOG,
diff --git
a/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/jdbc/FlinkJdbcMysqlCatalogIT.java
b/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/jdbc/FlinkJdbcMysqlCatalogIT.java
index 99b1b98ac9..f5d3249f27 100644
---
a/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/jdbc/FlinkJdbcMysqlCatalogIT.java
+++
b/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/jdbc/FlinkJdbcMysqlCatalogIT.java
@@ -82,7 +82,7 @@ public class FlinkJdbcMysqlCatalogIT extends FlinkCommonIT {
@AfterAll
void jdbcStop() {
- Preconditions.checkNotNull(metalake);
+ Preconditions.checkArgument(metalake != null, "metalake is null");
metalake.dropCatalog(CATALOG_NAME, true);
}
@@ -97,7 +97,7 @@ public class FlinkJdbcMysqlCatalogIT extends FlinkCommonIT {
}
private void init() {
- Preconditions.checkNotNull(metalake);
+ Preconditions.checkArgument(metalake != null, "metalake is null");
catalog =
metalake.createCatalog(
CATALOG_NAME,
diff --git
a/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/paimon/FlinkPaimonCatalogIT.java
b/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/paimon/FlinkPaimonCatalogIT.java
index caa480c756..e2dd51b5ad 100644
---
a/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/paimon/FlinkPaimonCatalogIT.java
+++
b/flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/paimon/FlinkPaimonCatalogIT.java
@@ -51,7 +51,7 @@ public abstract class FlinkPaimonCatalogIT extends
FlinkCommonIT {
}
private void initPaimonCatalog() {
- Preconditions.checkNotNull(metalake);
+ Preconditions.checkArgument(metalake != null, "metalake should not be
null");
catalog =
metalake.createCatalog(
getPaimonCatalogName(),
@@ -74,7 +74,7 @@ public abstract class FlinkPaimonCatalogIT extends
FlinkCommonIT {
@AfterAll
void paimonStop() {
- Preconditions.checkNotNull(metalake);
+ Preconditions.checkArgument(metalake != null, "metalake should not be
null");
metalake.dropCatalog(getPaimonCatalogName(), true);
}
diff --git
a/server-common/src/main/java/org/apache/gravitino/server/authorization/jcasbin/JcasbinAuthorizer.java
b/server-common/src/main/java/org/apache/gravitino/server/authorization/jcasbin/JcasbinAuthorizer.java
index ec20803119..fe921adf5b 100644
---
a/server-common/src/main/java/org/apache/gravitino/server/authorization/jcasbin/JcasbinAuthorizer.java
+++
b/server-common/src/main/java/org/apache/gravitino/server/authorization/jcasbin/JcasbinAuthorizer.java
@@ -109,7 +109,7 @@ public class JcasbinAuthorizer implements
GravitinoAuthorizer {
private Model getModel(String modelFilePath) {
Model model = new Model();
try (InputStream modelStream =
JcasbinAuthorizer.class.getResourceAsStream(modelFilePath)) {
- Preconditions.checkNotNull(modelStream, "Jcasbin model file can not
found.");
+ Preconditions.checkArgument(modelStream != null, "Jcasbin model file can
not found.");
String modelData = IOUtils.toString(modelStream, StandardCharsets.UTF_8);
model.loadModelFromText(modelData);
} catch (IOException e) {
diff --git
a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnector.java
b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnector.java
index cfb17ab431..c9b48b50d0 100644
---
a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnector.java
+++
b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnector.java
@@ -66,11 +66,12 @@ public class GravitinoConnector implements Connector {
public ConnectorTransactionHandle beginTransaction(
IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit) {
Connector internalConnector =
catalogConnectorContext.getInternalConnector();
- Preconditions.checkNotNull(internalConnector, "Internal connector must not
be null");
+ Preconditions.checkArgument(internalConnector != null, "Internal connector
must not be null");
ConnectorTransactionHandle internalTransactionHandler =
internalConnector.beginTransaction(isolationLevel, readOnly,
autoCommit);
- Preconditions.checkNotNull(internalTransactionHandler, "Transaction
handler must not be null");
+ Preconditions.checkArgument(
+ internalTransactionHandler != null, "Transaction handler must not be
null");
return new GravitinoTransactionHandle(internalTransactionHandler);
}
@@ -84,7 +85,7 @@ public class GravitinoConnector implements Connector {
Connector internalConnector =
catalogConnectorContext.getInternalConnector();
ConnectorMetadata internalMetadata =
internalConnector.getMetadata(session,
gravitinoTransactionHandle.getInternalHandle());
- Preconditions.checkNotNull(internalMetadata);
+ Preconditions.checkArgument(internalMetadata != null, "Internal metadata
must not be null");
GravitinoMetalake metalake = catalogConnectorContext.getMetalake();
diff --git
a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/CatalogConnectorManager.java
b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/CatalogConnectorManager.java
index 3e80e83902..ec0826d94e 100644
---
a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/CatalogConnectorManager.java
+++
b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/CatalogConnectorManager.java
@@ -109,7 +109,8 @@ public class CatalogConnectorManager {
* @param client the Gravitino admin client
*/
public void config(GravitinoConfig config, GravitinoAdminClient client) {
- this.config = Preconditions.checkNotNull(config, "config is not null");
+ Preconditions.checkArgument(config != null, "config is not null");
+ this.config = config;
if (client == null) {
this.gravitinoClient =
GravitinoAdminClient.builder(config.getURI())
diff --git
a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/system/table/GravitinoSystemTableCatalog.java
b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/system/table/GravitinoSystemTableCatalog.java
index e8d12dc48c..19aedef5fe 100644
---
a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/system/table/GravitinoSystemTableCatalog.java
+++
b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/system/table/GravitinoSystemTableCatalog.java
@@ -88,7 +88,7 @@ public class GravitinoSystemTableCatalog extends
GravitinoSystemTable {
BlockBuilder propertyColumnBuilder = VARCHAR.createBlockBuilder(null,
size);
for (GravitinoCatalog catalog : gravitinoCatalogs) {
- Preconditions.checkNotNull(catalog, "catalog should not be null");
+ Preconditions.checkArgument(catalog != null, "catalog should not be
null");
VARCHAR.writeString(nameColumnBuilder, catalog.getName());
VARCHAR.writeString(providerColumnBuilder, catalog.getProvider());
diff --git
a/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/TestGravitinoConnectorNullChecks.java
b/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/TestGravitinoConnectorNullChecks.java
index d11d9cbfac..bf69565b88 100644
---
a/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/TestGravitinoConnectorNullChecks.java
+++
b/trino-connector/trino-connector/src/test/java/org/apache/gravitino/trino/connector/TestGravitinoConnectorNullChecks.java
@@ -37,7 +37,7 @@ class TestGravitinoConnectorNullChecks {
when(mockContext.getInternalConnector()).thenReturn(null);
GravitinoConnector connector = new
GravitinoConnector(mock(NameIdentifier.class), mockContext);
assertThrows(
- NullPointerException.class,
+ IllegalArgumentException.class,
() -> connector.beginTransaction(IsolationLevel.READ_COMMITTED, true,
true));
}
@@ -50,7 +50,7 @@ class TestGravitinoConnectorNullChecks {
.thenReturn(null);
GravitinoConnector connector = new
GravitinoConnector(mock(NameIdentifier.class), mockContext);
assertThrows(
- NullPointerException.class,
+ IllegalArgumentException.class,
() -> connector.beginTransaction(IsolationLevel.READ_COMMITTED, true,
true));
}
}
