Apply timestamp prefix to querylogs only (#137)

* Apply timestamp prefix to querylogs only.

Author: dawidxc

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

@@ -19,11 +19,8 @@
 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;
 
 /**
  *
@@ -39,16 +36,7 @@ public enum DefaultProperties implements ConnectorProperty {
     public String getName();
 
     @Nonnull
-    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();
+    public String getDefaultFileName(boolean isAssessment);
 
     @Nonnull
     public void addTasksTo(@Nonnull List<? super Task<?>> out,

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

@@ -16,13 +16,23 @@
  */
 package com.google.edwmigration.dumper.application.dumper.connector;
 
+import java.text.Format;
+import java.text.SimpleDateFormat;
+import javax.annotation.Nonnull;
+import org.apache.commons.lang3.StringUtils;
+
 /**
  *
  * @author shevek
  */
 public interface LogsConnector extends Connector {
-    @Override
-    default String getType() {
-        return "logs";
+
+    @Nonnull
+    default String getDefaultFileName(boolean isAssessment) {
+        Format format = new SimpleDateFormat("yyyyMMdd'T'HHmmss");
+        String timeSuffix = "-" + format.format(System.currentTimeMillis());
+        return String.format("dwh-migration-%s-logs%s.zip",
+            getName(), isAssessment ? timeSuffix : StringUtils.EMPTY);
     }
+
 }

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

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

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

@@ -132,12 +132,6 @@ public String getDefaultFileName(boolean ignored) {
       return StringUtils.EMPTY;
     }
 
-    @Nonnull
-    @Override
-    public String getType() {
-      return StringUtils.EMPTY;
-    }
-
     @Override
     public void addTasksTo(@Nonnull List<? super Task<?>> out,
         @Nonnull ConnectorArguments arguments) {