Move a check to validate().

Author: misolt

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

@@ -160,6 +160,15 @@ private TaskDescription(
     }
   }
 
+  @Override
+  public void validate(ConnectorArguments arguments) {
+    super.validate(arguments);
+
+    if (arguments.isAssessment() && arguments.hasQueryLogEarliestTimestamp()) {
+      throw unsupportedOption(ConnectorArguments.OPT_QUERY_LOG_EARLIEST_TIMESTAMP);
+    }
+  }
+
   @Nonnull
   @Override
   public Class<? extends Enum<? extends ConnectorProperty>> getConnectorProperties() {
@@ -369,10 +378,6 @@ public final void addTasksTo(
 
     boolean isAssessment = arguments.isAssessment();
 
-    if (isAssessment && arguments.hasQueryLogEarliestTimestamp()) {
-      throw unsupportedOption(ConnectorArguments.OPT_QUERY_LOG_EARLIEST_TIMESTAMP);
-    }
-
     out.add(new DumpMetadataTask(arguments, FORMAT_NAME));
     out.add(new FormatTask(FORMAT_NAME));
 
@@ -387,7 +392,7 @@ public final void addTasksTo(
             arguments, rotationDuration, IntervalExpander.createBasedOnDuration(rotationDuration));
     logger.info("Exporting query log for " + queryLogIntervals);
 
-    if (!arguments.isAssessment()) {
+    if (!isAssessment) {
       TaskDescription queryHistoryTask =
           new TaskDescription(ZIP_ENTRY_PREFIX, newQueryFormat(arguments), Header.class);
       queryLogIntervals.forEach(interval -> addJdbcTask(out, interval, queryHistoryTask));
@@ -408,13 +413,6 @@ public final void addTasksTo(
         .forEach(interval -> timeSeriesTasks.forEach(task -> addJdbcTask(out, interval, task)));
   }
 
-  private static MetadataDumperUsageException unsupportedOption(String option) {
-    String assessment = ConnectorArguments.OPT_ASSESSMENT;
-    String message =
-        String.format("Unsupported option used with --%s: please remove --%s", assessment, option);
-    return new MetadataDumperUsageException(message);
-  }
-
   private static void addJdbcTask(
       List<? super Task<?>> out, ZonedInterval interval, TaskDescription task) {
     String query =
@@ -427,6 +425,13 @@ private static void addJdbcTask(
     out.add(new JdbcSelectTask(file, query, task.taskCategory).withHeaderClass(task.headerClass));
   }
 
+  private static MetadataDumperUsageException unsupportedOption(String option) {
+    String assessment = ConnectorArguments.OPT_ASSESSMENT;
+    String message =
+        String.format("Unsupported option used with --%s: please remove --%s", assessment, option);
+    return new MetadataDumperUsageException(message);
+  }
+
   private String getOverrideableQuery(
       @Nullable String overrideQuery, @Nonnull String defaultSql, @Nonnull String whereField) {
     String sql = overrideQuery != null ? overrideQuery : defaultSql;

dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnectorTest.java

@@ -23,7 +23,6 @@
 import com.google.edwmigration.dumper.test.TestUtils;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,7 +47,7 @@ public void testExecution() throws Exception {
   }
 
   @Test
-  public void addTasksTo_unsupportedOption_throwsException() throws IOException {
+  public void validate_unsupportedOption_throwsException() throws IOException {
     ConnectorArguments arguments =
         new ConnectorArguments(
             "--connector",
@@ -57,8 +56,6 @@ public void addTasksTo_unsupportedOption_throwsException() throws IOException {
             "--" + ConnectorArguments.OPT_QUERY_LOG_EARLIEST_TIMESTAMP,
             "2024");
 
-    Assert.assertThrows(
-        MetadataDumperUsageException.class,
-        () -> connector.addTasksTo(new ArrayList<>(), arguments));
+    Assert.assertThrows(MetadataDumperUsageException.class, () -> connector.validate(arguments));
   }
 }