This is an automated email from the ASF dual-hosted git repository.
jshao 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 79f1f7d8e [MINOR] fix: Correct the camel case naming issue and add
missing @Override annotations (#4256)
79f1f7d8e is described below
commit 79f1f7d8ee45b4794bada1b94d446783c5723c83
Author: RickyMa <[email protected]>
AuthorDate: Wed Jul 24 19:55:28 2024 +0800
[MINOR] fix: Correct the camel case naming issue and add missing @Override
annotations (#4256)
### What changes were proposed in this pull request?
Correct the camel case naming issue and add missing Override
annotations.
### Why are the changes needed?
Better code readability, maintainability, and adherence to coding
standards.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
No need.
---
.../catalog/doris/operation/DorisTableOperations.java | 1 +
.../catalog/mysql/operation/MysqlTableOperations.java | 1 +
.../postgresql/operation/PostgreSqlTableOperations.java | 1 +
.../org/apache/gravitino/client/TestRelationalCatalog.java | 14 +++++++-------
.../gravitino/dto/rel/partitions/ListPartitionDTO.java | 1 +
.../gravitino/dto/requests/FilesetUpdateRequest.java | 1 +
.../dto/responses/MetadataObjectListResponse.java | 1 +
.../java/org/apache/gravitino/dto/util/DTOConverters.java | 8 ++++----
.../org/apache/gravitino/dto/util/TestDTOConverters.java | 4 ++--
.../main/java/org/apache/gravitino/meta/GroupEntity.java | 2 ++
.../main/java/org/apache/gravitino/meta/UserEntity.java | 1 +
core/src/main/java/org/apache/gravitino/utils/Bytes.java | 1 +
.../gravitino/server/web/rest/MetalakeOperations.java | 6 +++---
13 files changed, 26 insertions(+), 16 deletions(-)
diff --git
a/catalogs/catalog-jdbc-doris/src/main/java/org/apache/gravitino/catalog/doris/operation/DorisTableOperations.java
b/catalogs/catalog-jdbc-doris/src/main/java/org/apache/gravitino/catalog/doris/operation/DorisTableOperations.java
index b25bd14c3..180924589 100644
---
a/catalogs/catalog-jdbc-doris/src/main/java/org/apache/gravitino/catalog/doris/operation/DorisTableOperations.java
+++
b/catalogs/catalog-jdbc-doris/src/main/java/org/apache/gravitino/catalog/doris/operation/DorisTableOperations.java
@@ -546,6 +546,7 @@ public class DorisTableOperations extends
JdbcTableOperations {
.collect(Collectors.joining(",\n"));
}
+ @Override
protected JdbcTable getOrCreateTable(
String databaseName, String tableName, JdbcTable lazyLoadCreateTable) {
return null != lazyLoadCreateTable ? lazyLoadCreateTable :
load(databaseName, tableName);
diff --git
a/catalogs/catalog-jdbc-mysql/src/main/java/org/apache/gravitino/catalog/mysql/operation/MysqlTableOperations.java
b/catalogs/catalog-jdbc-mysql/src/main/java/org/apache/gravitino/catalog/mysql/operation/MysqlTableOperations.java
index b862b1936..4f8931a9c 100644
---
a/catalogs/catalog-jdbc-mysql/src/main/java/org/apache/gravitino/catalog/mysql/operation/MysqlTableOperations.java
+++
b/catalogs/catalog-jdbc-mysql/src/main/java/org/apache/gravitino/catalog/mysql/operation/MysqlTableOperations.java
@@ -492,6 +492,7 @@ public class MysqlTableOperations extends
JdbcTableOperations {
.collect(Collectors.joining(",\n"));
}
+ @Override
protected JdbcTable getOrCreateTable(
String databaseName, String tableName, JdbcTable lazyLoadCreateTable) {
return null != lazyLoadCreateTable ? lazyLoadCreateTable :
load(databaseName, tableName);
diff --git
a/catalogs/catalog-jdbc-postgresql/src/main/java/org/apache/gravitino/catalog/postgresql/operation/PostgreSqlTableOperations.java
b/catalogs/catalog-jdbc-postgresql/src/main/java/org/apache/gravitino/catalog/postgresql/operation/PostgreSqlTableOperations.java
index 17e46ed7c..fde21ce48 100644
---
a/catalogs/catalog-jdbc-postgresql/src/main/java/org/apache/gravitino/catalog/postgresql/operation/PostgreSqlTableOperations.java
+++
b/catalogs/catalog-jdbc-postgresql/src/main/java/org/apache/gravitino/catalog/postgresql/operation/PostgreSqlTableOperations.java
@@ -576,6 +576,7 @@ public class PostgreSqlTableOperations extends
JdbcTableOperations {
+ ";";
}
+ @Override
public JdbcTable getOrCreateTable(
String databaseName, String tableName, JdbcTable lazyLoadTable) {
if (null == lazyLoadTable) {
diff --git
a/clients/client-java/src/test/java/org/apache/gravitino/client/TestRelationalCatalog.java
b/clients/client-java/src/test/java/org/apache/gravitino/client/TestRelationalCatalog.java
index a494b422a..01d17271e 100644
---
a/clients/client-java/src/test/java/org/apache/gravitino/client/TestRelationalCatalog.java
+++
b/clients/client-java/src/test/java/org/apache/gravitino/client/TestRelationalCatalog.java
@@ -647,7 +647,7 @@ public class TestRelationalCatalog extends TestBase {
createMockColumn("city", Types.IntegerType.get(), "comment1"),
createMockColumn("dt", Types.DateType.get(), "comment2")
};
- IndexDTO[] indexDTOS =
+ IndexDTO[] indexDTOs =
new IndexDTO[] {
IndexDTO.builder()
.withIndexType(IndexDTO.IndexType.PRIMARY_KEY)
@@ -670,7 +670,7 @@ public class TestRelationalCatalog extends TestBase {
EMPTY_PARTITIONING,
DistributionDTO.NONE,
SortOrderDTO.EMPTY_SORT,
- indexDTOS);
+ indexDTOs);
TableCreateRequest req =
new TableCreateRequest(
@@ -681,7 +681,7 @@ public class TestRelationalCatalog extends TestBase {
SortOrderDTO.EMPTY_SORT,
DistributionDTO.NONE,
EMPTY_PARTITIONING,
- indexDTOS);
+ indexDTOs);
TableResponse resp = new TableResponse(expectedTable);
buildMockResource(Method.POST, tablePath, req, resp, SC_OK);
@@ -696,7 +696,7 @@ public class TestRelationalCatalog extends TestBase {
EMPTY_PARTITIONING,
DistributionDTO.NONE,
SortOrderDTO.EMPTY_SORT,
- indexDTOS);
+ indexDTOs);
assertTableEquals(fromDTO(expectedTable), table);
// Test throw TableAlreadyExistsException
@@ -719,7 +719,7 @@ public class TestRelationalCatalog extends TestBase {
EMPTY_PARTITIONING,
DistributionDTO.NONE,
SortOrderDTO.EMPTY_SORT,
- indexDTOS));
+ indexDTOs));
Assertions.assertTrue(ex1.getMessage().contains("table already exists"));
}
@@ -1260,7 +1260,7 @@ public class TestRelationalCatalog extends TestBase {
Partitioning[] partitioning,
DistributionDTO distributionDTO,
SortOrderDTO[] sortOrderDTOs,
- IndexDTO[] indexDTOS) {
+ IndexDTO[] indexDTOs) {
return TableDTO.builder()
.withName(name)
.withColumns(columns)
@@ -1270,7 +1270,7 @@ public class TestRelationalCatalog extends TestBase {
.withSortOrders(sortOrderDTOs)
.withAudit(AuditDTO.builder().withCreator("creator").withCreateTime(Instant.now()).build())
.withPartitioning(partitioning)
- .withIndex(indexDTOS)
+ .withIndex(indexDTOs)
.build();
}
}
diff --git
a/common/src/main/java/org/apache/gravitino/dto/rel/partitions/ListPartitionDTO.java
b/common/src/main/java/org/apache/gravitino/dto/rel/partitions/ListPartitionDTO.java
index 735ad7f62..f36ea1fa1 100644
---
a/common/src/main/java/org/apache/gravitino/dto/rel/partitions/ListPartitionDTO.java
+++
b/common/src/main/java/org/apache/gravitino/dto/rel/partitions/ListPartitionDTO.java
@@ -68,6 +68,7 @@ public class ListPartitionDTO implements PartitionDTO,
ListPartition {
}
/** @return The type of the partition. */
+ @Override
public Type type() {
return Type.LIST;
}
diff --git
a/common/src/main/java/org/apache/gravitino/dto/requests/FilesetUpdateRequest.java
b/common/src/main/java/org/apache/gravitino/dto/requests/FilesetUpdateRequest.java
index 0a8e456cc..c7aa79cb8 100644
---
a/common/src/main/java/org/apache/gravitino/dto/requests/FilesetUpdateRequest.java
+++
b/common/src/main/java/org/apache/gravitino/dto/requests/FilesetUpdateRequest.java
@@ -138,6 +138,7 @@ public interface FilesetUpdateRequest extends RESTRequest {
private final String value;
/** @return The fileset change. */
+ @Override
public FilesetChange filesetChange() {
return FilesetChange.setProperty(property, value);
}
diff --git
a/common/src/main/java/org/apache/gravitino/dto/responses/MetadataObjectListResponse.java
b/common/src/main/java/org/apache/gravitino/dto/responses/MetadataObjectListResponse.java
index 67b26a5f5..860c3b405 100644
---
a/common/src/main/java/org/apache/gravitino/dto/responses/MetadataObjectListResponse.java
+++
b/common/src/main/java/org/apache/gravitino/dto/responses/MetadataObjectListResponse.java
@@ -57,6 +57,7 @@ public class MetadataObjectListResponse extends BaseResponse {
*
* @throws IllegalArgumentException if name or audit information is not set.
*/
+ @Override
public void validate() throws IllegalArgumentException {
super.validate();
diff --git
a/common/src/main/java/org/apache/gravitino/dto/util/DTOConverters.java
b/common/src/main/java/org/apache/gravitino/dto/util/DTOConverters.java
index fa6ae6b56..ba99d527f 100644
--- a/common/src/main/java/org/apache/gravitino/dto/util/DTOConverters.java
+++ b/common/src/main/java/org/apache/gravitino/dto/util/DTOConverters.java
@@ -736,15 +736,15 @@ public class DTOConverters {
/**
* Converts an array of IndexDTOs to an array of Indexes.
*
- * @param indexDTOS The Index DTOs to be converted.
+ * @param indexDTOs The Index DTOs to be converted.
* @return The array of Indexes.
*/
- public static Index[] fromDTOs(IndexDTO[] indexDTOS) {
- if (ArrayUtils.isEmpty(indexDTOS)) {
+ public static Index[] fromDTOs(IndexDTO[] indexDTOs) {
+ if (ArrayUtils.isEmpty(indexDTOs)) {
return Indexes.EMPTY_INDEXES;
}
- return
Arrays.stream(indexDTOS).map(DTOConverters::fromDTO).toArray(Index[]::new);
+ return
Arrays.stream(indexDTOs).map(DTOConverters::fromDTO).toArray(Index[]::new);
}
/**
diff --git
a/common/src/test/java/org/apache/gravitino/dto/util/TestDTOConverters.java
b/common/src/test/java/org/apache/gravitino/dto/util/TestDTOConverters.java
index a6f630a27..46a2ffa11 100644
--- a/common/src/test/java/org/apache/gravitino/dto/util/TestDTOConverters.java
+++ b/common/src/test/java/org/apache/gravitino/dto/util/TestDTOConverters.java
@@ -119,7 +119,7 @@ public class TestDTOConverters {
LiteralDTO.builder().withDataType(Types.StringType.get()).withValue("us").build();
Map<String, String> properties = Collections.singletonMap("key", "value");
- LiteralDTO[][] literalDTOS = {new LiteralDTO[] {literal1}, new
LiteralDTO[] {literal2}};
+ LiteralDTO[][] literalDTOs = {new LiteralDTO[] {literal1}, new
LiteralDTO[] {literal2}};
Literal<?>[][] expectedValues = {
new Literal<?>[] {(Literal<?>) DTOConverters.fromFunctionArg(literal1)},
new Literal<?>[] {(Literal<?>) DTOConverters.fromFunctionArg(literal2)}
@@ -127,7 +127,7 @@ public class TestDTOConverters {
ListPartitionDTO listPartitionDTO =
ListPartitionDTO.builder()
.withName("ListPartition")
- .withLists(literalDTOS)
+ .withLists(literalDTOs)
.withProperties(properties)
.build();
diff --git a/core/src/main/java/org/apache/gravitino/meta/GroupEntity.java
b/core/src/main/java/org/apache/gravitino/meta/GroupEntity.java
index e94c1fd3a..d9e4b633d 100644
--- a/core/src/main/java/org/apache/gravitino/meta/GroupEntity.java
+++ b/core/src/main/java/org/apache/gravitino/meta/GroupEntity.java
@@ -118,6 +118,7 @@ public class GroupEntity implements Group, Entity,
Auditable, HasIdentifier {
*
* @return The audit details of the group.
*/
+ @Override
public AuditInfo auditInfo() {
return auditInfo;
}
@@ -127,6 +128,7 @@ public class GroupEntity implements Group, Entity,
Auditable, HasIdentifier {
*
* @return The roles of the group entity.
*/
+ @Override
public List<String> roles() {
return roleNames;
}
diff --git a/core/src/main/java/org/apache/gravitino/meta/UserEntity.java
b/core/src/main/java/org/apache/gravitino/meta/UserEntity.java
index 0fa3d93c8..c71d731a9 100644
--- a/core/src/main/java/org/apache/gravitino/meta/UserEntity.java
+++ b/core/src/main/java/org/apache/gravitino/meta/UserEntity.java
@@ -121,6 +121,7 @@ public class UserEntity implements User, Entity, Auditable,
HasIdentifier {
*
* @return The audit details of the user.
*/
+ @Override
public AuditInfo auditInfo() {
return auditInfo;
}
diff --git a/core/src/main/java/org/apache/gravitino/utils/Bytes.java
b/core/src/main/java/org/apache/gravitino/utils/Bytes.java
index 6e05d2fd0..b83710a70 100644
--- a/core/src/main/java/org/apache/gravitino/utils/Bytes.java
+++ b/core/src/main/java/org/apache/gravitino/utils/Bytes.java
@@ -208,6 +208,7 @@ public class Bytes implements Comparable<byte[]> {
return compare(buffer1, 0, buffer1.length, buffer2, 0, buffer2.length);
}
+ @Override
public int compare(
final byte[] buffer1,
int offset1,
diff --git
a/server/src/main/java/org/apache/gravitino/server/web/rest/MetalakeOperations.java
b/server/src/main/java/org/apache/gravitino/server/web/rest/MetalakeOperations.java
index 4bdac4b35..fff86cf2e 100644
---
a/server/src/main/java/org/apache/gravitino/server/web/rest/MetalakeOperations.java
+++
b/server/src/main/java/org/apache/gravitino/server/web/rest/MetalakeOperations.java
@@ -83,10 +83,10 @@ public class MetalakeOperations {
() -> {
Metalake[] metalakes =
TreeLockUtils.doWithRootTreeLock(LockType.READ,
metalakeDispatcher::listMetalakes);
- MetalakeDTO[] metalakeDTOS =
+ MetalakeDTO[] metalakeDTOs =
Arrays.stream(metalakes).map(DTOConverters::toDTO).toArray(MetalakeDTO[]::new);
- Response response = Utils.ok(new
MetalakeListResponse(metalakeDTOS));
- LOG.info("List {} metalakes in Gravitino", metalakeDTOS.length);
+ Response response = Utils.ok(new
MetalakeListResponse(metalakeDTOs));
+ LOG.info("List {} metalakes in Gravitino", metalakeDTOs.length);
return response;
});
