add output-dir flag (#138)

Author: ishmum123

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/ConnectorArguments.java

@@ -20,6 +20,10 @@
 import com.google.common.base.Predicates;
 import com.google.common.base.Strings;
 import com.google.common.collect.ComparisonChain;
+import com.google.edwmigration.dumper.application.dumper.annotations.RespectsInput;
+import com.google.edwmigration.dumper.application.dumper.connector.Connector;
+import com.google.edwmigration.dumper.application.dumper.connector.ConnectorProperty;
+import com.google.edwmigration.dumper.plugin.ext.jdk.annotation.Description;
 import java.io.Console;
 import java.io.File;
 import java.io.IOException;
@@ -54,10 +58,6 @@
 import joptsimple.ValueConverter;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
-import com.google.edwmigration.dumper.application.dumper.annotations.RespectsInput;
-import com.google.edwmigration.dumper.application.dumper.connector.Connector;
-import com.google.edwmigration.dumper.application.dumper.connector.ConnectorProperty;
-import com.google.edwmigration.dumper.plugin.ext.jdk.annotation.Description;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.AnnotationUtils;
@@ -138,7 +138,8 @@ public class ConnectorArguments extends DefaultArguments {
     private final OptionSpec<String> optionOracleSID = parser.accepts(OPT_ORACLE_SID, "SID name for oracle").withRequiredArg().describedAs("orcl").ofType(String.class);
     private final OptionSpec<String> optionConfiguration = parser.accepts("config", "Configuration for DB connector").withRequiredArg().ofType(String.class).withValuesSeparatedBy(';').describedAs("key=val;key1=val1");
     // private final OptionSpec<String> optionDatabase = parser.accepts("database", "database (can be repeated; all if not specified)").withRequiredArg().describedAs("my_dbname").withValuesSeparatedBy(',');
-    private final OptionSpec<File> optionOutput = parser.accepts("output", "Output file").withRequiredArg().ofType(File.class).describedAs("cw-dump.zip");
+    private final OptionSpec<File> optionOutput = parser.accepts("output", "Output file (cannot be used together with --output-dir)").withRequiredArg().ofType(File.class).describedAs("cw-dump.zip");
+    private final OptionSpec<String> optionOutputDir = parser.accepts("output-dir", "Output directory where the zip file with the default filename should be created (cannot be used together with --output option). If you want to specify the filename, use --output option instead.").withRequiredArg().ofType(String.class).defaultsTo("").describedAs("/home/user/my-dump-dir");
     private final OptionSpec<Void> optionOutputContinue = parser.accepts("continue", "Continues writing a previous output file.");
     // TODO: Make this be an ISO instant.
     @Deprecated
@@ -466,6 +467,11 @@ public File getOutputFile() {
         return getOptions().valueOf(optionOutput);
     }
 
+    @CheckForNull
+    public String getOutputDirectory() {
+        return getOptions().valueOf(optionOutputDir);
+    }
+
     public boolean isOutputContinue() {
         return getOptions().has(optionOutputContinue);
     }
@@ -627,6 +633,7 @@ public String toString() {
                 .add("user", getUser())
                 .add("configuration", getConfiguration())
                 .add("output", getOutputFile())
+                .add("output-dir", getOutputDirectory())
                 .add("query-log-earliest-timestamp", getQueryLogEarliestTimestamp())
                 .add("query-log-days", getQueryLogDays())
                 .add("query-log-start", getQueryLogStart())

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/MetadataDumper.java

@@ -194,8 +194,21 @@ protected void run(@Nonnull Connector connector, @Nonnull ConnectorArguments arg
         // We had a customer request to base it on the database, but that isn't well-defined,
         // as there may be 0 or N databases in a single file.
         File outputFile = arguments.getOutputFile();
+        String outputDirectory = arguments.getOutputDirectory();
+
+        boolean isDefaultPath = "".equals(outputDirectory);
+        if (!isDefaultPath && outputFile != null) {
+            System.out.println(
+                "**********************************************************\n"
+                + "* ERROR: Using both --output and --output-dir flags is not allowed.\n"
+                + "* Please use --help for more information.\n"
+                + "**********************************************************"
+            );
+            return;
+        }
+
         if (outputFile == null) {
-            outputFile = new File(connector.getDefaultFileName(arguments.isAssessment()));
+            outputFile = new File(outputDirectory, connector.getDefaultFileName(arguments.isAssessment()));
         }
         if (arguments.isDryRun()) {
             String title = "Dry run: Printing task list for " + connector.getName();