Skip to content

Commit 1821345

Browse files
authored
[#5593] improvement(iceberg): Add final to Iceberg table event members, fix return codes for rename and exists operations (#5594)
### What changes were proposed in this pull request? 1. Add final to Iceberg table-related events and their members. 2. Modify the return codes in `IcebergTableOperations` and `IcebergTableRenameOperations` to align with the specification, and update the relevant unit tests. ### Why are the changes needed? Close: #5593 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Unit test
1 parent 977758d commit 1821345

17 files changed

+20
-20
lines changed

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/rest/IcebergTableOperations.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ public Response tableExists(
249249
TableIdentifier tableIdentifier = TableIdentifier.of(icebergNS, table);
250250
boolean exists = tableOperationDispatcher.tableExists(context, tableIdentifier);
251251
if (exists) {
252-
return IcebergRestUtils.okWithoutContent();
252+
return IcebergRestUtils.noContent();
253253
} else {
254254
return IcebergRestUtils.notExists();
255255
}

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/rest/IcebergTableRenameOperations.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public Response renameTable(
6868
renameTableRequest.destination());
6969
IcebergRequestContext context = new IcebergRequestContext(httpServletRequest(), catalogName);
7070
tableOperationDispatcher.renameTable(context, renameTableRequest);
71-
return IcebergRestUtils.okWithoutContent();
71+
return IcebergRestUtils.noContent();
7272
}
7373

7474
// HTTP request is null in Jersey test, override with a mock request when testing.

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergCreateTableEvent.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
@DeveloperApi
3030
public class IcebergCreateTableEvent extends IcebergTableEvent {
3131

32-
private CreateTableRequest createTableRequest;
33-
private LoadTableResponse loadTableResponse;
32+
private final CreateTableRequest createTableRequest;
33+
private final LoadTableResponse loadTableResponse;
3434

3535
public IcebergCreateTableEvent(
3636
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergCreateTableFailureEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/** Represent a failure event when creating Iceberg table failed. */
2828
@DeveloperApi
2929
public class IcebergCreateTableFailureEvent extends IcebergTableFailureEvent {
30-
private CreateTableRequest createTableRequest;
30+
private final CreateTableRequest createTableRequest;
3131

3232
public IcebergCreateTableFailureEvent(
3333
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergCreateTablePreEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/** Represent a pre event before creating Iceberg table. */
2727
@DeveloperApi
2828
public class IcebergCreateTablePreEvent extends IcebergTablePreEvent {
29-
private CreateTableRequest createTableRequest;
29+
private final CreateTableRequest createTableRequest;
3030

3131
public IcebergCreateTablePreEvent(
3232
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergDropTableEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/** Represent an event after dropping Iceberg table successfully. */
2626
@DeveloperApi
2727
public class IcebergDropTableEvent extends IcebergTableEvent {
28-
private boolean purgeRequested;
28+
private final boolean purgeRequested;
2929

3030
public IcebergDropTableEvent(
3131
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergDropTableFailureEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/** Represent a failure event when dropping Iceberg table failed. */
2626
@DeveloperApi
2727
public class IcebergDropTableFailureEvent extends IcebergTableFailureEvent {
28-
private boolean purgeRequested;
28+
private final boolean purgeRequested;
2929

3030
public IcebergDropTableFailureEvent(
3131
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergDropTablePreEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/** Represent a pre event before dropping Iceberg table. */
2626
@DeveloperApi
2727
public class IcebergDropTablePreEvent extends IcebergTablePreEvent {
28-
private boolean purgeRequested;
28+
private final boolean purgeRequested;
2929

3030
public IcebergDropTablePreEvent(
3131
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergLoadTableEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/** Represent an event after loading Iceberg table successfully. */
2828
@DeveloperApi
2929
public class IcebergLoadTableEvent extends IcebergTableEvent {
30-
private LoadTableResponse loadTableResponse;
30+
private final LoadTableResponse loadTableResponse;
3131

3232
public IcebergLoadTableEvent(
3333
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergRenameTableEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/** Represent an event after rename Iceberg table successfully. */
2828
@DeveloperApi
2929
public class IcebergRenameTableEvent extends IcebergTableEvent {
30-
private RenameTableRequest renameTableRequest;
30+
private final RenameTableRequest renameTableRequest;
3131

3232
public IcebergRenameTableEvent(
3333
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergRenameTableFailureEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/** Represent an event when rename Iceberg table failed. */
2727
@DeveloperApi
2828
public class IcebergRenameTableFailureEvent extends IcebergTableFailureEvent {
29-
private RenameTableRequest renameTableRequest;
29+
private final RenameTableRequest renameTableRequest;
3030

3131
public IcebergRenameTableFailureEvent(
3232
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergRenameTablePreEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/** Represent an pre event before rename an Iceberg table. */
2727
@DeveloperApi
2828
public class IcebergRenameTablePreEvent extends IcebergTablePreEvent {
29-
private RenameTableRequest renameTableRequest;
29+
private final RenameTableRequest renameTableRequest;
3030

3131
public IcebergRenameTablePreEvent(
3232
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergTableExistsEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/** Represent an event after check Iceberg table exists successfully. */
2626
@DeveloperApi
2727
public class IcebergTableExistsEvent extends IcebergTableEvent {
28-
private boolean isExists;
28+
private final boolean isExists;
2929

3030
public IcebergTableExistsEvent(
3131
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergUpdateTableEvent.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
@DeveloperApi
3030
public class IcebergUpdateTableEvent extends IcebergTableEvent {
3131

32-
private UpdateTableRequest updateTableRequest;
33-
private LoadTableResponse loadTableResponse;
32+
private final UpdateTableRequest updateTableRequest;
33+
private final LoadTableResponse loadTableResponse;
3434

3535
public IcebergUpdateTableEvent(
3636
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergUpdateTableFailureEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/** Represent a failure event when updating Iceberg table failed. */
2828
@DeveloperApi
2929
public class IcebergUpdateTableFailureEvent extends IcebergTableFailureEvent {
30-
private UpdateTableRequest updateTableRequest;
30+
private final UpdateTableRequest updateTableRequest;
3131

3232
public IcebergUpdateTableFailureEvent(
3333
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/listener/api/event/IcebergUpdateTablePreEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/** Represent a pre event before updating Iceberg table. */
2727
@DeveloperApi
2828
public class IcebergUpdateTablePreEvent extends IcebergTablePreEvent {
29-
private UpdateTableRequest updateTableRequest;
29+
private final UpdateTableRequest updateTableRequest;
3030

3131
public IcebergUpdateTablePreEvent(
3232
IcebergRequestContext icebergRequestContext,

iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/rest/TestIcebergTableOperations.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ void testTableExits() {
210210

211211
verifyCreateTableSucc("exists_foo1");
212212
dummyEventListener.clearEvent();
213-
verifyTableExistsStatusCode("exists_foo1", 200);
213+
verifyTableExistsStatusCode("exists_foo1", 204);
214214
Assertions.assertTrue(dummyEventListener.popPreEvent() instanceof IcebergTableExistsPreEvent);
215215
postEvent = dummyEventListener.popPostEvent();
216216
Assertions.assertTrue(postEvent instanceof IcebergTableExistsEvent);
@@ -430,7 +430,7 @@ private void verifyRenameTableSucc(String source, String dest) {
430430
Response response = doRenameTable(source, dest);
431431
System.out.println(response);
432432
System.out.flush();
433-
Assertions.assertEquals(Status.OK.getStatusCode(), response.getStatus());
433+
Assertions.assertEquals(Status.NO_CONTENT.getStatusCode(), response.getStatus());
434434
}
435435

436436
private void verifyRenameTableFail(String source, String dest, int status) {

0 commit comments

Comments
 (0)