From 108c3982aa23ee6bd21e1da68d74495eb28a5fa1 Mon Sep 17 00:00:00 2001
From: Brijeshthummar02 <brijeshthummar02@gmail.com>
Date: Fri, 7 Mar 2025 17:31:31 +0530
Subject: [PATCH] Refactor error handling and improve output messages in CLI
 commands

---
 .../org/apache/gravitino/cli/commands/ListColumns.java |  2 +-
 .../org/apache/gravitino/cli/commands/ListTables.java  |  5 +++--
 .../gravitino/cli/commands/ListTagProperties.java      |  2 +-
 .../apache/gravitino/cli/commands/ModelDetails.java    |  2 +-
 .../org/apache/gravitino/cli/commands/SchemaAudit.java |  1 -
 .../org/apache/gravitino/cli/commands/UserDetails.java | 10 +++++-----
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListColumns.java b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListColumns.java
index 11ee82b2633..258ef308864 100644
--- a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListColumns.java
+++ b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListColumns.java
@@ -82,7 +82,7 @@ public void handle() {
               + " "
               + Joiner.on(".").join(metalake, catalog, schema, table));
     } catch (Exception exp) {
-      exitWithError("An error occurred while retrieving column details: " + exp.getMessage());
+      printResults("An error occurred while retrieving column details: " + exp.getMessage());
     }
   }
 }
diff --git a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListTables.java b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListTables.java
index cf750289f6e..bffce35c280 100644
--- a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListTables.java
+++ b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListTables.java
@@ -47,7 +47,7 @@ public ListTables(CommandContext context, String metalake, String catalog, Strin
   /** List the names of all tables in a schema. */
   @Override
   public void handle() {
-    try {
+
       Namespace name = Namespace.of(schema);
       NameIdentifier[] tables = tableCatalog().listTables(name);
 
@@ -55,7 +55,8 @@ public void handle() {
         printInformation("No tables exist.");
         return;
       }
-
+      
+      try {
       Table[] gTables = new Table[tables.length];
       for (int i = 0; i < tables.length; i++) {
         String tableName = tables[i].name();
diff --git a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListTagProperties.java b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListTagProperties.java
index ddd979e2981..927b13b1708 100644
--- a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListTagProperties.java
+++ b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ListTagProperties.java
@@ -59,7 +59,7 @@ public void handle() {
     } catch (NoSuchTagException err) {
       exitWithError(ErrorMessages.UNKNOWN_TAG);
     } catch (Exception exp) {
-      exitWithError("An unexpected error occurred: " + exp.getMessage());
+      exitWithError(exp.getMessage());
     }
 
     if (gTag == null) {
diff --git a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ModelDetails.java b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ModelDetails.java
index 1881fe512e4..fe05104e319 100644
--- a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ModelDetails.java
+++ b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/ModelDetails.java
@@ -78,7 +78,7 @@ public void handle() {
     } catch (NoSuchModelException err) {
       exitWithError(ErrorMessages.UNKNOWN_MODEL);
     } catch (Exception err) {
-      exitWithError("An unexpected error occurred: " + err.getMessage());
+      exitWithError(err.getMessage());
     }
 
     if (gModel == null) {
diff --git a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/SchemaAudit.java b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/SchemaAudit.java
index cf7a6e1cf2a..14ebe4c2b87 100644
--- a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/SchemaAudit.java
+++ b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/SchemaAudit.java
@@ -70,7 +70,6 @@ public void handle() {
 
     if (result == null) {
       exitWithError("Failed to retrieve schema details.");
-      return;
     }
 
     displayAuditInfo(result.auditInfo());
diff --git a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/UserDetails.java b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/UserDetails.java
index 49f37857f35..dd6f43d558f 100644
--- a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/UserDetails.java
+++ b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/UserDetails.java
@@ -51,18 +51,18 @@ public void handle() {
 
     try (GravitinoClient client = buildClient(metalake)) {
       roles = client.getUser(user).roles();
-    } catch (NoSuchMetalakeException e) {
+    } catch (NoSuchMetalakeException err) {
       exitWithError(ErrorMessages.UNKNOWN_METALAKE);
-    } catch (NoSuchUserException e) {
+    } catch (NoSuchUserException err) {
       exitWithError(ErrorMessages.UNKNOWN_USER);
-    } catch (Exception e) {
-      exitWithError(e.getMessage());
+    } catch (Exception err) {
+      exitWithError(err.getMessage());
     }
 
     if (roles == null || roles.isEmpty()) {
       printInformation("The user has no assigned roles.");
     } else {
-      printResults("User Roles: " + String.join(", ", roles));
+      printResults(String.join(",", roles));
     }
   }
 }