Skip to content

Commit 108c398

Browse files
Refactor error handling and improve output messages in CLI commands
1 parent 349b343 commit 108c398

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListColumns.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void handle() {
8282
+ " "
8383
+ Joiner.on(".").join(metalake, catalog, schema, table));
8484
} catch (Exception exp) {
85-
exitWithError("An error occurred while retrieving column details: " + exp.getMessage());
85+
printResults("An error occurred while retrieving column details: " + exp.getMessage());
8686
}
8787
}
8888
}

clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListTables.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,16 @@ public ListTables(CommandContext context, String metalake, String catalog, Strin
4747
/** List the names of all tables in a schema. */
4848
@Override
4949
public void handle() {
50-
try {
50+
5151
Namespace name = Namespace.of(schema);
5252
NameIdentifier[] tables = tableCatalog().listTables(name);
5353

5454
if (tables == null || tables.length == 0) {
5555
printInformation("No tables exist.");
5656
return;
5757
}
58-
58+
59+
try {
5960
Table[] gTables = new Table[tables.length];
6061
for (int i = 0; i < tables.length; i++) {
6162
String tableName = tables[i].name();

clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListTagProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void handle() {
5959
} catch (NoSuchTagException err) {
6060
exitWithError(ErrorMessages.UNKNOWN_TAG);
6161
} catch (Exception exp) {
62-
exitWithError("An unexpected error occurred: " + exp.getMessage());
62+
exitWithError(exp.getMessage());
6363
}
6464

6565
if (gTag == null) {

clients/cli/src/main/java/org/apache/gravitino/cli/commands/ModelDetails.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void handle() {
7878
} catch (NoSuchModelException err) {
7979
exitWithError(ErrorMessages.UNKNOWN_MODEL);
8080
} catch (Exception err) {
81-
exitWithError("An unexpected error occurred: " + err.getMessage());
81+
exitWithError(err.getMessage());
8282
}
8383

8484
if (gModel == null) {

clients/cli/src/main/java/org/apache/gravitino/cli/commands/SchemaAudit.java

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ public void handle() {
7070

7171
if (result == null) {
7272
exitWithError("Failed to retrieve schema details.");
73-
return;
7473
}
7574

7675
displayAuditInfo(result.auditInfo());

clients/cli/src/main/java/org/apache/gravitino/cli/commands/UserDetails.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ public void handle() {
5151

5252
try (GravitinoClient client = buildClient(metalake)) {
5353
roles = client.getUser(user).roles();
54-
} catch (NoSuchMetalakeException e) {
54+
} catch (NoSuchMetalakeException err) {
5555
exitWithError(ErrorMessages.UNKNOWN_METALAKE);
56-
} catch (NoSuchUserException e) {
56+
} catch (NoSuchUserException err) {
5757
exitWithError(ErrorMessages.UNKNOWN_USER);
58-
} catch (Exception e) {
59-
exitWithError(e.getMessage());
58+
} catch (Exception err) {
59+
exitWithError(err.getMessage());
6060
}
6161

6262
if (roles == null || roles.isEmpty()) {
6363
printInformation("The user has no assigned roles.");
6464
} else {
65-
printResults("User Roles: " + String.join(", ", roles));
65+
printResults(String.join(",", roles));
6666
}
6767
}
6868
}

0 commit comments

Comments
 (0)