add quiet to merged code

apache · Jan 14, 2025 · c48e92e · c48e92e
1 parent e6988bb
commit c48e92e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 18 deletions.
diff --git a/clients/cli/src/main/java/org/apache/gravitino/cli/FilesetCommandHandler.java b/clients/cli/src/main/java/org/apache/gravitino/cli/FilesetCommandHandler.java
@@ -38,6 +38,7 @@ public class FilesetCommandHandler extends CommandHandler {
   private final String catalog;
   private final String schema;
   private String fileset;
+  private final boolean quiet;
 
   /**
    * Constructs a {@link FilesetCommandHandler} instance.
@@ -46,13 +47,19 @@ public class FilesetCommandHandler extends CommandHandler {
    * @param line The command line arguments.
    * @param command The command to execute.
    * @param ignore Ignore server version mismatch.
+   * @param quiet Suppress output.
    */
   public FilesetCommandHandler(
-      GravitinoCommandLine gravitinoCommandLine, CommandLine line, String command, boolean ignore) {
+      GravitinoCommandLine gravitinoCommandLine,
+      CommandLine line,
+      String command,
+      boolean ignore,
+      boolean quiet) {
     this.gravitinoCommandLine = gravitinoCommandLine;
     this.line = line;
     this.command = command;
     this.ignore = ignore;
+    this.quiet = quiet;
 
     this.url = gravitinoCommandLine.getUrl();
     this.name = new FullName(line);
@@ -141,7 +148,8 @@ private void handleCreateCommand() {
     String[] properties = line.getOptionValues(CommandActions.PROPERTIES);
     Map<String, String> propertyMap = new Properties().parse(properties);
     gravitinoCommandLine
-        .newCreateFileset(url, ignore, metalake, catalog, schema, fileset, comment, propertyMap)
+        .newCreateFileset(
+            url, ignore, quiet, metalake, catalog, schema, fileset, comment, propertyMap)
         .validate()
         .handle();
   }
@@ -150,7 +158,7 @@ private void handleCreateCommand() {
   private void handleDeleteCommand() {
     boolean force = line.hasOption(GravitinoOptions.FORCE);
     gravitinoCommandLine
-        .newDeleteFileset(url, ignore, force, metalake, catalog, schema, fileset)
+        .newDeleteFileset(url, ignore, quiet, force, metalake, catalog, schema, fileset)
         .validate()
         .handle();
   }
@@ -160,7 +168,8 @@ private void handleSetCommand() {
     String property = line.getOptionValue(GravitinoOptions.PROPERTY);
     String value = line.getOptionValue(GravitinoOptions.VALUE);
     gravitinoCommandLine
-        .newSetFilesetProperty(url, ignore, metalake, catalog, schema, fileset, property, value)
+        .newSetFilesetProperty(
+            url, ignore, quiet, metalake, catalog, schema, fileset, property, value)
         .validate()
         .handle();
   }
@@ -169,7 +178,7 @@ private void handleSetCommand() {
   private void handleRemoveCommand() {
     String property = line.getOptionValue(GravitinoOptions.PROPERTY);
     gravitinoCommandLine
-        .newRemoveFilesetProperty(url, ignore, metalake, catalog, schema, fileset, property)
+        .newRemoveFilesetProperty(url, ignore, quiet, metalake, catalog, schema, fileset, property)
         .validate()
         .handle();
   }
@@ -195,14 +204,14 @@ private void handleUpdateCommand() {
     if (line.hasOption(GravitinoOptions.COMMENT)) {
       String comment = line.getOptionValue(GravitinoOptions.COMMENT);
       gravitinoCommandLine
-          .newUpdateFilesetComment(url, ignore, metalake, catalog, schema, fileset, comment)
+          .newUpdateFilesetComment(url, ignore, quiet, metalake, catalog, schema, fileset, comment)
           .validate()
           .handle();
     }
     if (line.hasOption(GravitinoOptions.RENAME)) {
       String newName = line.getOptionValue(GravitinoOptions.RENAME);
       gravitinoCommandLine
-          .newUpdateFilesetName(url, ignore, metalake, catalog, schema, fileset, newName)
+          .newUpdateFilesetName(url, ignore, quiet, metalake, catalog, schema, fileset, newName)
           .validate()
           .handle();
     }

diff --git a/clients/cli/src/main/java/org/apache/gravitino/cli/GravitinoCommandLine.java b/clients/cli/src/main/java/org/apache/gravitino/cli/GravitinoCommandLine.java
@@ -136,11 +136,11 @@ private void executeCommand() {
     } else if (entity.equals(CommandEntities.CATALOG)) {
       new CatalogCommandHandler(this, line, command, ignore, quiet).handle();
     } else if (entity.equals(CommandEntities.METALAKE)) {
-      new MetalakeCommandHandler(this, line, command, ignore).handle();
+      new MetalakeCommandHandler(this, line, command, ignore, quiet).handle();
     } else if (entity.equals(CommandEntities.TOPIC)) {
       new TopicCommandHandler(this, line, command, ignore, quiet).handle();
     } else if (entity.equals(CommandEntities.FILESET)) {
-      new FilesetCommandHandler(this, line, command, ignore).handle();
+      new FilesetCommandHandler(this, line, command, ignore, quiet).handle();
     } else if (entity.equals(CommandEntities.USER)) {
       new UserCommandHandler(this, line, command, ignore, quiet).handle();
     } else if (entity.equals(CommandEntities.GROUP)) {

diff --git a/clients/cli/src/main/java/org/apache/gravitino/cli/MetalakeCommandHandler.java b/clients/cli/src/main/java/org/apache/gravitino/cli/MetalakeCommandHandler.java
@@ -33,6 +33,7 @@ public class MetalakeCommandHandler extends CommandHandler {
   private final boolean ignore;
   private final String url;
   private String metalake;
+  private final boolean quiet;
 
   /**
    * Constructs a MetalakeCommandHandler instance.
@@ -41,13 +42,19 @@ public class MetalakeCommandHandler extends CommandHandler {
    * @param line The command line arguments.
    * @param command The command to execute.
    * @param ignore Ignore server version mismatch.
+   * @param quiet Suppress output.
    */
   public MetalakeCommandHandler(
-      GravitinoCommandLine gravitinoCommandLine, CommandLine line, String command, boolean ignore) {
+      GravitinoCommandLine gravitinoCommandLine,
+      CommandLine line,
+      String command,
+      boolean ignore,
+      boolean quiet) {
     this.gravitinoCommandLine = gravitinoCommandLine;
     this.line = line;
     this.command = command;
     this.ignore = ignore;
+    this.quiet = quiet;
     this.url = getUrl(line);
   }
 
@@ -132,21 +139,24 @@ private void handleDetailsCommand() {
   /** Handles the "CREATE" command. */
   private void handleCreateCommand() {
     String comment = line.getOptionValue(GravitinoOptions.COMMENT);
-    gravitinoCommandLine.newCreateMetalake(url, ignore, metalake, comment).validate().handle();
+    gravitinoCommandLine
+        .newCreateMetalake(url, ignore, quiet, metalake, comment)
+        .validate()
+        .handle();
   }
 
   /** Handles the "DELETE" command. */
   private void handleDeleteCommand() {
     boolean force = line.hasOption(GravitinoOptions.FORCE);
-    gravitinoCommandLine.newDeleteMetalake(url, ignore, force, metalake).validate().handle();
+    gravitinoCommandLine.newDeleteMetalake(url, ignore, quiet, force, metalake).validate().handle();
   }
 
   /** Handles the "SET" command. */
   private void handleSetCommand() {
     String property = line.getOptionValue(GravitinoOptions.PROPERTY);
     String value = line.getOptionValue(GravitinoOptions.VALUE);
     gravitinoCommandLine
-        .newSetMetalakeProperty(url, ignore, metalake, property, value)
+        .newSetMetalakeProperty(url, ignore, quiet, metalake, property, value)
         .validate()
         .handle();
   }
@@ -155,7 +165,7 @@ private void handleSetCommand() {
   private void handleRemoveCommand() {
     String property = line.getOptionValue(GravitinoOptions.PROPERTY);
     gravitinoCommandLine
-        .newRemoveMetalakeProperty(url, ignore, metalake, property)
+        .newRemoveMetalakeProperty(url, ignore, quiet, metalake, property)
         .validate()
         .handle();
   }
@@ -174,26 +184,26 @@ private void handleUpdateCommand() {
     if (line.hasOption(GravitinoOptions.ENABLE)) {
       boolean enableAllCatalogs = line.hasOption(GravitinoOptions.ALL);
       gravitinoCommandLine
-          .newMetalakeEnable(url, ignore, metalake, enableAllCatalogs)
+          .newMetalakeEnable(url, ignore, quiet, metalake, enableAllCatalogs)
           .validate()
           .handle();
     }
     if (line.hasOption(GravitinoOptions.DISABLE)) {
-      gravitinoCommandLine.newMetalakeDisable(url, ignore, metalake).validate().handle();
+      gravitinoCommandLine.newMetalakeDisable(url, ignore, quiet, metalake).validate().handle();
     }
 
     if (line.hasOption(GravitinoOptions.COMMENT)) {
       String comment = line.getOptionValue(GravitinoOptions.COMMENT);
       gravitinoCommandLine
-          .newUpdateMetalakeComment(url, ignore, metalake, comment)
+          .newUpdateMetalakeComment(url, ignore, quiet, metalake, comment)
           .validate()
           .handle();
     }
     if (line.hasOption(GravitinoOptions.RENAME)) {
       String newName = line.getOptionValue(GravitinoOptions.RENAME);
       boolean force = line.hasOption(GravitinoOptions.FORCE);
       gravitinoCommandLine
-          .newUpdateMetalakeName(url, ignore, force, metalake, newName)
+          .newUpdateMetalakeName(url, ignore, quiet, force, metalake, newName)
           .validate()
           .handle();
     }