add timestamp to zip archive name (#134)

* add timestamp to zip archive name

* only add timestamp for assessment

* minor formatting

Author: ishmum123

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

@@ -191,8 +191,9 @@ 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();
-        if (outputFile == null)
-            outputFile = new File(connector.getDefaultFileName());
+        if (outputFile == null) {
+            outputFile = new File(connector.getDefaultFileName(arguments.isAssessment()));
+        }
         if (arguments.isDryRun()) {
             String title = "Dry run: Printing task list for " + connector.getName();
             System.out.println(title);

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/Connector.java

@@ -16,11 +16,14 @@
  */
 package com.google.edwmigration.dumper.application.dumper.connector;
 
-import java.util.List;
-import javax.annotation.Nonnull;
 import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
 import com.google.edwmigration.dumper.application.dumper.handle.Handle;
 import com.google.edwmigration.dumper.application.dumper.task.Task;
+import java.text.Format;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import javax.annotation.Nonnull;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
@@ -36,10 +39,20 @@ public enum DefaultProperties implements ConnectorProperty {
     public String getName();
 
     @Nonnull
-    public String getDefaultFileName();
+    default String getDefaultFileName(boolean isAssessment) {
+        Format format = new SimpleDateFormat("yyyyMMdd'T'HHmmss");
+        String timeSuffix = "-" + format.format(System.currentTimeMillis());
+        return String.format("dwh-migration-%s-%s%s.zip",
+            getName(), getType(), isAssessment ? timeSuffix : StringUtils.EMPTY
+        );
+    }
+
+    @Nonnull
+    String getType();
 
     @Nonnull
-    public void addTasksTo(@Nonnull List<? super Task<?>> out, @Nonnull ConnectorArguments arguments) throws Exception;
+    public void addTasksTo(@Nonnull List<? super Task<?>> out,
+        @Nonnull ConnectorArguments arguments) throws Exception;
 
     @Nonnull
     public Handle open(@Nonnull ConnectorArguments arguments) throws Exception;

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/LogsConnector.java

@@ -21,9 +21,8 @@
  * @author shevek
  */
 public interface LogsConnector extends Connector {
-
     @Override
-    default public String getDefaultFileName() {
-        return "dwh-migration-" + getName() + "-logs.zip";
+    default String getType() {
+        return "logs";
     }
 }

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/MetadataConnector.java

@@ -21,9 +21,8 @@
  * @author shevek
  */
 public interface MetadataConnector extends Connector {
-
     @Override
-    default public String getDefaultFileName() {
-        return "dwh-migration-" + getName() + "-metadata.zip";
+    default String getType() {
+        return "metadata";
     }
 }

dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/DriverClasspathTest.java

@@ -128,7 +128,13 @@ public DummyConnector(@Nonnull String name) {
 
     @Nonnull
     @Override
-    public String getDefaultFileName() {
+    public String getDefaultFileName(boolean ignored) {
+      return StringUtils.EMPTY;
+    }
+
+    @Nonnull
+    @Override
+    public String getType() {
       return StringUtils.EMPTY;
     }