[#6136] improvement(CLI): Move check for enable and disable command in Gravitino CLI to command

clients/cli/src/main/java/org/apache/gravitino/cli/CatalogCommandHandler.java

@@ -175,19 +175,9 @@ private void handlePropertiesCommand() {
 
   /** Handles the "UPDATE" command. */
   private void handleUpdateCommand() {
-    if (line.hasOption(GravitinoOptions.ENABLE) && line.hasOption(GravitinoOptions.DISABLE)) {
-      System.err.println(ErrorMessages.INVALID_ENABLE_DISABLE);
-      Main.exit(-1);
-    }
-    if (line.hasOption(GravitinoOptions.ENABLE)) {
-      boolean enableMetalake = line.hasOption(GravitinoOptions.ALL);
-      gravitinoCommandLine
-          .newCatalogEnable(context, metalake, catalog, enableMetalake)
-          .validate()
-          .handle();
-    }
-    if (line.hasOption(GravitinoOptions.DISABLE)) {
-      gravitinoCommandLine.newCatalogDisable(context, metalake, catalog).validate().handle();
+
+    if (line.hasOption(GravitinoOptions.ENABLE) || line.hasOption(GravitinoOptions.DISABLE)) {
+      gravitinoCommandLine.newManageCatalog(context, metalake, catalog).validate().handle();
     }
 
     if (line.hasOption(GravitinoOptions.COMMENT)) {

clients/cli/src/main/java/org/apache/gravitino/cli/CommandContext.java

@@ -115,6 +115,14 @@ public String auth() {
     return auth;
   }
 
+  /**
+   * Returns the command line.
+   *
+   * @return The command line.
+   */
+  public CommandLine line() {
+    return line;
+  }
   /**
    * Retrieves the Gravitino URL from the command line options or the GRAVITINO_URL environment
    * variable or the Gravitino config file.

clients/cli/src/main/java/org/apache/gravitino/cli/ErrorMessages.java

@@ -39,7 +39,7 @@ public class ErrorMessages {
   public static final String ENTITY_IN_USE = " in use, please disable it first.";
 
   public static final String INVALID_ENABLE_DISABLE =
-      "Unable to us --enable and --disable at the same time";
+      "Unable to use --enable and --disable at the same time.";
   public static final String INVALID_OWNER_COMMAND =
       "Unsupported combination of options either use --user or --group.";
   public static final String INVALID_REMOVE_COMMAND =

clients/cli/src/main/java/org/apache/gravitino/cli/MetalakeCommandHandler.java

@@ -159,19 +159,8 @@ private void handlePropertiesCommand() {
 
   /** Handles the "UPDATE" command. */
   private void handleUpdateCommand() {
-    if (line.hasOption(GravitinoOptions.ENABLE) && line.hasOption(GravitinoOptions.DISABLE)) {
-      System.err.println(ErrorMessages.INVALID_ENABLE_DISABLE);
-      Main.exit(-1);
-    }
-    if (line.hasOption(GravitinoOptions.ENABLE)) {
-      boolean enableAllCatalogs = line.hasOption(GravitinoOptions.ALL);
-      gravitinoCommandLine
-          .newMetalakeEnable(context, metalake, enableAllCatalogs)
-          .validate()
-          .handle();
-    }
-    if (line.hasOption(GravitinoOptions.DISABLE)) {
-      gravitinoCommandLine.newMetalakeDisable(context, metalake).validate().handle();
+    if (line.hasOption(GravitinoOptions.ENABLE) || line.hasOption(GravitinoOptions.DISABLE)) {
+      gravitinoCommandLine.newManageMetalake(context, metalake).validate().handle();
     }
 
     if (line.hasOption(GravitinoOptions.COMMENT)) {

clients/cli/src/main/java/org/apache/gravitino/cli/TestableCommandLine.java

@@ -26,8 +26,6 @@
 import org.apache.gravitino.cli.commands.AddRoleToUser;
 import org.apache.gravitino.cli.commands.CatalogAudit;
 import org.apache.gravitino.cli.commands.CatalogDetails;
-import org.apache.gravitino.cli.commands.CatalogDisable;
-import org.apache.gravitino.cli.commands.CatalogEnable;
 import org.apache.gravitino.cli.commands.ClientVersion;
 import org.apache.gravitino.cli.commands.ColumnAudit;
 import org.apache.gravitino.cli.commands.CreateCatalog;
@@ -78,10 +76,10 @@
 import org.apache.gravitino.cli.commands.ListTopicProperties;
 import org.apache.gravitino.cli.commands.ListTopics;
 import org.apache.gravitino.cli.commands.ListUsers;
+import org.apache.gravitino.cli.commands.ManageCatalog;
+import org.apache.gravitino.cli.commands.ManageMetalake;
 import org.apache.gravitino.cli.commands.MetalakeAudit;
 import org.apache.gravitino.cli.commands.MetalakeDetails;
-import org.apache.gravitino.cli.commands.MetalakeDisable;
-import org.apache.gravitino.cli.commands.MetalakeEnable;
 import org.apache.gravitino.cli.commands.ModelAudit;
 import org.apache.gravitino.cli.commands.ModelDetails;
 import org.apache.gravitino.cli.commands.OwnerDetails;
@@ -839,23 +837,13 @@ protected RevokeAllPrivileges newRevokeAllPrivileges(
     return new RevokeAllPrivileges(context, metalake, role, entity);
   }
 
-  protected MetalakeEnable newMetalakeEnable(
-      CommandContext context, String metalake, boolean enableAllCatalogs) {
-    return new MetalakeEnable(context, metalake, enableAllCatalogs);
+  protected ManageMetalake newManageMetalake(CommandContext context, String metalake) {
+    return new ManageMetalake(context, metalake);
   }
 
-  protected MetalakeDisable newMetalakeDisable(CommandContext context, String metalake) {
-    return new MetalakeDisable(context, metalake);
-  }
-
-  protected CatalogEnable newCatalogEnable(
-      CommandContext context, String metalake, String catalog, boolean enableMetalake) {
-    return new CatalogEnable(context, metalake, catalog, enableMetalake);
-  }
-
-  protected CatalogDisable newCatalogDisable(
+  protected ManageCatalog newManageCatalog(
       CommandContext context, String metalake, String catalog) {
-    return new CatalogDisable(context, metalake, catalog);
+    return new ManageCatalog(context, metalake, catalog);
   }
 
   protected ListModel newListModel(

clients/cli/src/main/java/org/apache/gravitino/cli/commands/CatalogEnable.java → clients/cli/src/main/java/org/apache/gravitino/cli/commands/ManageCatalog.java

@@ -16,41 +16,63 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.gravitino.cli.commands;
 
+import org.apache.commons.cli.CommandLine;
 import org.apache.gravitino.cli.CommandContext;
 import org.apache.gravitino.cli.ErrorMessages;
+import org.apache.gravitino.cli.GravitinoOptions;
 import org.apache.gravitino.client.GravitinoAdminClient;
 import org.apache.gravitino.client.GravitinoClient;
 import org.apache.gravitino.exceptions.MetalakeNotInUseException;
 import org.apache.gravitino.exceptions.NoSuchCatalogException;
 import org.apache.gravitino.exceptions.NoSuchMetalakeException;
 
-/** Enable catalog. */
-public class CatalogEnable extends Command {
+/** Disable or enable a catalog. */
+public class ManageCatalog extends Command {
   private final String metalake;
   private final String catalog;
+  private final CommandLine line;
   private final boolean enableMetalake;
 
   /**
-   * Enable catalog
+   * Constrcut a new instance of the {@code ManageCatalog}.
    *
-   * @param context The command context.
-   * @param metalake The name of the metalake.
-   * @param catalog The name of the catalog.
-   * @param enableMetalake Whether to enable it's metalake
+   * @param context the command context.
+   * @param metalake the metalake name.
+   * @param catalog the catalog name.
    */
-  public CatalogEnable(
-      CommandContext context, String metalake, String catalog, boolean enableMetalake) {
+  public ManageCatalog(CommandContext context, String metalake, String catalog) {
     super(context);
     this.metalake = metalake;
     this.catalog = catalog;
-    this.enableMetalake = enableMetalake;
+    this.line = context.line();
+    this.enableMetalake = line.hasOption(GravitinoOptions.ALL);
   }
 
-  /** Enable catalog. */
+  /** Disable or enable a catalog. */
   @Override
   public void handle() {
+    if (line.hasOption(GravitinoOptions.ENABLE)) {
+      enableCatalog();
+    } else if (line.hasOption(GravitinoOptions.DISABLE)) {
+      disableCatalog();
+    }
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public Command validate() {
+    if (line.hasOption(GravitinoOptions.ENABLE) && line.hasOption(GravitinoOptions.DISABLE)) {
+      exitWithError(ErrorMessages.INVALID_ENABLE_DISABLE);
+    }
+
+    return super.validate();
+  }
+
+  /** Enable a catalog. */
+  private void enableCatalog() {
     try {
       if (enableMetalake) {
         GravitinoAdminClient adminClient = buildAdminClient();
@@ -71,4 +93,20 @@ public void handle() {
 
     printInformation(metalake + "." + catalog + " has been enabled.");
   }
+
+  /** Disable a catalog. */
+  private void disableCatalog() {
+    try {
+      GravitinoClient client = buildClient(metalake);
+      client.disableCatalog(catalog);
+    } catch (NoSuchMetalakeException noSuchMetalakeException) {
+      exitWithError(ErrorMessages.UNKNOWN_METALAKE);
+    } catch (NoSuchCatalogException noSuchCatalogException) {
+      exitWithError(ErrorMessages.UNKNOWN_CATALOG);
+    } catch (Exception exp) {
+      exitWithError(exp.getMessage());
+    }
+
+    printInformation(metalake + "." + catalog + " has been disabled.");
+  }
 }

clients/cli/src/main/java/org/apache/gravitino/cli/commands/MetalakeEnable.java → clients/cli/src/main/java/org/apache/gravitino/cli/commands/ManageMetalake.java

@@ -20,34 +20,56 @@
 package org.apache.gravitino.cli.commands;
 
 import java.util.Arrays;
+import org.apache.commons.cli.CommandLine;
 import org.apache.gravitino.cli.CommandContext;
 import org.apache.gravitino.cli.ErrorMessages;
+import org.apache.gravitino.cli.GravitinoOptions;
 import org.apache.gravitino.client.GravitinoAdminClient;
 import org.apache.gravitino.client.GravitinoMetalake;
 import org.apache.gravitino.exceptions.NoSuchMetalakeException;
 
-/** Enable metalake. */
-public class MetalakeEnable extends Command {
-
+/** Disable or enable metalake. */
+public class ManageMetalake extends Command {
   private final String metalake;
+  private final CommandLine line;
   private Boolean enableAllCatalogs;
 
   /**
-   * Enable a metalake
+   * Construct a new instance of the {@code ManageMetalake}.
    *
-   * @param context The command context.
-   * @param metalake The name of the metalake.
-   * @param enableAllCatalogs Whether to enable all catalogs.
+   * @param context the command context.
+   * @param metalake the name of the metalake.
    */
-  public MetalakeEnable(CommandContext context, String metalake, boolean enableAllCatalogs) {
+  public ManageMetalake(CommandContext context, String metalake) {
     super(context);
     this.metalake = metalake;
-    this.enableAllCatalogs = enableAllCatalogs;
+    this.line = context.line();
+
+    this.enableAllCatalogs = line.hasOption(GravitinoOptions.ALL);
   }
 
-  /** Enable metalake. */
+  /** Disable or enable the metalake. */
   @Override
   public void handle() {
+    if (line.hasOption(GravitinoOptions.ENABLE)) {
+      enableMetalake();
+    } else if (line.hasOption(GravitinoOptions.DISABLE)) {
+      disableMetalake();
+    }
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public Command validate() {
+    if (line.hasOption(GravitinoOptions.ENABLE) && line.hasOption(GravitinoOptions.DISABLE)) {
+      exitWithError(ErrorMessages.INVALID_ENABLE_DISABLE);
+    }
+
+    return super.validate();
+  }
+
+  /** Enable the metalake. */
+  private void enableMetalake() {
     StringBuilder msgBuilder = new StringBuilder(metalake);
     try {
       GravitinoAdminClient client = buildAdminClient();
@@ -68,4 +90,18 @@ public void handle() {
 
     printInformation(msgBuilder.toString());
   }
+
+  /** Disable the metalake. */
+  private void disableMetalake() {
+    try {
+      GravitinoAdminClient client = buildAdminClient();
+      client.disableMetalake(metalake);
+    } catch (NoSuchMetalakeException err) {
+      exitWithError(ErrorMessages.UNKNOWN_METALAKE);
+    } catch (Exception exp) {
+      exitWithError(exp.getMessage());
+    }
+
+    printInformation(metalake + " has been disabled.");
+  }
 }