This is an automated email from the ASF dual-hosted git repository.
jmclean 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 ce16a71580 [#7596] style: update code style (#7608)
ce16a71580 is described below
commit ce16a7158004ebc04176eaa3c89878b8d653eaa7
Author: Jarvis <[email protected]>
AuthorDate: Wed Jul 9 08:23:49 2025 +0800
[#7596] style: update code style (#7608)
### What changes were proposed in this pull request?
unifed code style, the boolean type check use ` if( exp ) or if( !exp )
rather than if ( exp == true ), if (exp == false ) `
### Why are the changes needed?
close #7596
### Does this PR introduce _any_ user-facing change?
No, just code style change
### How was this patch tested?
using existing tests
---
.../catalog/jdbc/TestJdbcCatalogOperations.java | 27 +++++++++++-----------
.../iceberg/common/ops/IcebergCatalogWrapper.java | 4 +---
.../service/metrics/IcebergMetricsManager.java | 4 ++--
.../spark/connector/SparkTableChangeConverter.java | 2 +-
.../connector/plugin/GravitinoDriverPlugin.java | 2 +-
.../integration/test/sql/SparkQueryRunner.java | 2 +-
.../test/sql/SparkSQLRegressionTest.java | 2 +-
.../spark/connector/SparkTypeConverter34.java | 2 +-
8 files changed, 22 insertions(+), 23 deletions(-)
diff --git
a/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/TestJdbcCatalogOperations.java
b/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/TestJdbcCatalogOperations.java
index 39512ff9a6..0b082d5916 100644
---
a/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/TestJdbcCatalogOperations.java
+++
b/catalogs/catalog-jdbc-common/src/test/java/org/apache/gravitino/catalog/jdbc/TestJdbcCatalogOperations.java
@@ -41,22 +41,23 @@ public class TestJdbcCatalogOperations {
@Test
public void testTestConnection() {
- JdbcCatalogOperations catalogOperations =
+ try (JdbcCatalogOperations catalogOperations =
new JdbcCatalogOperations(
new SqliteExceptionConverter(),
new SqliteTypeConverter(),
new SqliteDatabaseOperations("/illegal/path"),
new SqliteTableOperations(),
- new SqliteColumnDefaultValueConverter());
- Assertions.assertThrows(
- GravitinoRuntimeException.class,
- () ->
- catalogOperations.testConnection(
- NameIdentifier.of("metalake", "catalog"),
- Catalog.Type.RELATIONAL,
- "sqlite",
- "comment",
- ImmutableMap.of()));
+ new SqliteColumnDefaultValueConverter())) {
+ Assertions.assertThrows(
+ GravitinoRuntimeException.class,
+ () ->
+ catalogOperations.testConnection(
+ NameIdentifier.of("metalake", "catalog"),
+ Catalog.Type.RELATIONAL,
+ "sqlite",
+ "comment",
+ ImmutableMap.of()));
+ }
}
@Test
@@ -70,8 +71,8 @@ public class TestJdbcCatalogOperations {
DataSource dataSource =
Assertions.assertDoesNotThrow(() ->
DataSourceUtils.createDataSource(properties));
- Assertions.assertTrue(dataSource instanceof
org.apache.commons.dbcp2.BasicDataSource);
- Assertions.assertTrue(((BasicDataSource) dataSource).getTestOnBorrow() ==
false);
+ Assertions.assertInstanceOf(BasicDataSource.class, dataSource);
+ Assertions.assertFalse(((BasicDataSource) dataSource).getTestOnBorrow());
((BasicDataSource) dataSource).close();
}
}
diff --git
a/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/ops/IcebergCatalogWrapper.java
b/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/ops/IcebergCatalogWrapper.java
index 79898c4d2d..ff925c1cf1 100644
---
a/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/ops/IcebergCatalogWrapper.java
+++
b/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/ops/IcebergCatalogWrapper.java
@@ -96,9 +96,7 @@ public class IcebergCatalogWrapper implements AutoCloseable {
private void validateNamespace(Optional<Namespace> namespace) {
namespace.ifPresent(
- n ->
- Preconditions.checkArgument(
- n.toString().isEmpty() == false, "Namespace couldn't be
empty"));
+ n -> Preconditions.checkArgument(!n.toString().isEmpty(), "Namespace
couldn't be empty"));
if (asNamespaceCatalog == null) {
throw new UnsupportedOperationException(
"The underlying catalog doesn't support namespace operation");
diff --git
a/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/metrics/IcebergMetricsManager.java
b/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/metrics/IcebergMetricsManager.java
index b22ddca373..d6ba7d6f9d 100644
---
a/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/metrics/IcebergMetricsManager.java
+++
b/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/metrics/IcebergMetricsManager.java
@@ -113,7 +113,7 @@ public class IcebergMetricsManager {
logMetrics("Drop Iceberg metrics because Iceberg Metrics Manager is
closed.", metricsReport);
return;
}
- if (queue.offer(metricsReport) == false) {
+ if (!queue.offer(metricsReport)) {
logMetrics("Drop Iceberg metrics because metrics queue is full.",
metricsReport);
}
}
@@ -146,7 +146,7 @@ public class IcebergMetricsManager {
}
private void writeMetrics() {
- while (Thread.currentThread().isInterrupted() == false) {
+ while (!Thread.currentThread().isInterrupted()) {
MetricsReport metricsReport;
try {
metricsReport = queue.take();
diff --git
a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/SparkTableChangeConverter.java
b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/SparkTableChangeConverter.java
index cc79360815..1db82c2d8c 100644
---
a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/SparkTableChangeConverter.java
+++
b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/SparkTableChangeConverter.java
@@ -40,7 +40,7 @@ public class SparkTableChangeConverter {
} else if (change instanceof TableChange.RemoveProperty) {
TableChange.RemoveProperty removeProperty = (TableChange.RemoveProperty)
change;
Preconditions.checkArgument(
- ConnectorConstants.COMMENT.equals(removeProperty.property()) ==
false,
+ !ConnectorConstants.COMMENT.equals(removeProperty.property()),
"Gravitino doesn't support remove table comment yet");
return
org.apache.gravitino.rel.TableChange.removeProperty(removeProperty.property());
} else if (change instanceof TableChange.AddColumn) {
diff --git
a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/plugin/GravitinoDriverPlugin.java
b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/plugin/GravitinoDriverPlugin.java
index d46ef3d9f1..468e0e0cda 100644
---
a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/plugin/GravitinoDriverPlugin.java
+++
b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/plugin/GravitinoDriverPlugin.java
@@ -117,7 +117,7 @@ public class GravitinoDriverPlugin implements DriverPlugin {
Catalog gravitinoCatalog = entry.getValue();
String provider = gravitinoCatalog.provider();
if ("lakehouse-iceberg".equals(provider.toLowerCase(Locale.ROOT))
- && enableIcebergSupport == false) {
+ && !enableIcebergSupport) {
return;
}
try {
diff --git
a/spark-connector/spark-common/src/test/java/org/apache/gravitino/spark/connector/integration/test/sql/SparkQueryRunner.java
b/spark-connector/spark-common/src/test/java/org/apache/gravitino/spark/connector/integration/test/sql/SparkQueryRunner.java
index 02301b362e..f367b24dfb 100644
---
a/spark-connector/spark-common/src/test/java/org/apache/gravitino/spark/connector/integration/test/sql/SparkQueryRunner.java
+++
b/spark-connector/spark-common/src/test/java/org/apache/gravitino/spark/connector/integration/test/sql/SparkQueryRunner.java
@@ -282,7 +282,7 @@ public class SparkQueryRunner {
List<String> codes = new ArrayList<>();
for (String line : lines) {
String trimmedLine = line.trim();
- if (trimmedLine.startsWith("--") &&
trimmedLine.startsWith("--QUERY-DELIMITER") == false) {
+ if (trimmedLine.startsWith("--") &&
!trimmedLine.startsWith("--QUERY-DELIMITER")) {
comments.add(line);
} else {
codes.add(line);
diff --git
a/spark-connector/spark-common/src/test/java/org/apache/gravitino/spark/connector/integration/test/sql/SparkSQLRegressionTest.java
b/spark-connector/spark-common/src/test/java/org/apache/gravitino/spark/connector/integration/test/sql/SparkSQLRegressionTest.java
index e6d517b8f6..336a244af2 100644
---
a/spark-connector/spark-common/src/test/java/org/apache/gravitino/spark/connector/integration/test/sql/SparkSQLRegressionTest.java
+++
b/spark-connector/spark-common/src/test/java/org/apache/gravitino/spark/connector/integration/test/sql/SparkSQLRegressionTest.java
@@ -112,7 +112,7 @@ public abstract class SparkSQLRegressionTest {
throw new RuntimeException(e);
}
- if (testCases.isEmpty() == false) {
+ if (!testCases.isEmpty()) {
sqlTestCaseGroups.add(
new TestCaseGroup(testCases, prepareSql, cleanupSql,
parentCatalogType));
}
diff --git
a/spark-connector/v3.4/spark/src/main/java/org/apache/gravitino/spark/connector/SparkTypeConverter34.java
b/spark-connector/v3.4/spark/src/main/java/org/apache/gravitino/spark/connector/SparkTypeConverter34.java
index 4d264517d0..62d443713f 100644
---
a/spark-connector/v3.4/spark/src/main/java/org/apache/gravitino/spark/connector/SparkTypeConverter34.java
+++
b/spark-connector/v3.4/spark/src/main/java/org/apache/gravitino/spark/connector/SparkTypeConverter34.java
@@ -38,7 +38,7 @@ public class SparkTypeConverter34 extends SparkTypeConverter {
@Override
public DataType toSparkType(Type gravitinoType) {
if (gravitinoType instanceof Types.TimestampType
- && ((Types.TimestampType) gravitinoType).hasTimeZone() == false) {
+ && !((Types.TimestampType) gravitinoType).hasTimeZone()) {
return DataTypes.TimestampNTZType;
} else {
return super.toSparkType(gravitinoType);
