Replace the annotation with a SF-only method

Author: misolt

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

@@ -26,7 +26,6 @@
 import java.time.ZonedDateTime;
 import java.util.List;
 import javax.annotation.Nonnull;
-import javax.annotation.OverridingMethodsMustInvokeSuper;
 
 /** @author shevek */
 public interface Connector {
@@ -53,7 +52,6 @@ default String getDescription() {
    * @param arguments cli params
    * @throws RuntimeException if incorrect set of arguments passed to the particular connector
    */
-  @OverridingMethodsMustInvokeSuper
   default void validate(@Nonnull ConnectorArguments arguments) {}
 
   static void validateDateRange(@Nonnull ConnectorArguments arguments) {

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

@@ -210,7 +210,7 @@ private static void addQueryTask(
   }
 
   @Override
-  public void validate(@Nonnull ConnectorArguments arguments) {
+  public final void validate(@Nonnull ConnectorArguments arguments) {
     Preconditions.checkState(arguments.isAssessment(), "--assessment flag is required");
     Preconditions.checkState(
         arguments.getDriverPaths() != null && !arguments.getDriverPaths().isEmpty(),

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/cloudera/manager/ClouderaManagerConnector.java

@@ -130,7 +130,7 @@ public ClouderaManagerHandle open(@Nonnull ConnectorArguments arguments) throws
   }
 
   @Override
-  public void validate(@Nonnull ConnectorArguments arguments) {
+  public final void validate(@Nonnull ConnectorArguments arguments) {
     String clouderaUri = arguments.getUri();
     Preconditions.checkNotNull(clouderaUri, "--url for Cloudera Manager API is required");
 

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/hadoop/oozie/OozieConnector.java

@@ -81,7 +81,7 @@ public String getDefaultFileName(boolean isAssessment, Clock clock) {
   }
 
   @Override
-  public void validate(@Nonnull ConnectorArguments arguments) {
+  public final void validate(@Nonnull ConnectorArguments arguments) {
     Preconditions.checkState(arguments.isAssessment(), "--assessment flag is required");
 
     validateDateRange(arguments);

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

@@ -101,9 +101,7 @@ public Handle open(@Nonnull ConnectorArguments arguments)
   }
 
   @Override
-  public void validate(@Nonnull ConnectorArguments arguments) {
-    super.validate(arguments);
-
+  public final void validate(@Nonnull ConnectorArguments arguments) {
     ArrayList<String> messages = new ArrayList<>();
     MetadataDumperUsageException exception = null;
 
@@ -133,8 +131,18 @@ public void validate(@Nonnull ConnectorArguments arguments) {
       exception = new MetadataDumperUsageException(unsupportedFilter, messages);
     }
     removeDuplicateMessageAndThrow(exception);
+    validateForSnowflake(arguments);
   }
 
+  /**
+   * Called by {@link #validate} to perform connector-specific checks.
+   *
+   * <p>Subclasses should override this with logic to run after the common validation for Snowflake.
+   *
+   * @param arguments User-provided arguments of the Dumper run.
+   */
+  protected abstract void validateForSnowflake(@Nonnull ConnectorArguments arguments);
+
   private static void removeDuplicateMessageAndThrow(
       @Nullable MetadataDumperUsageException exception) {
     if (exception != null) {

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

@@ -20,12 +20,10 @@
 import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
 import com.google.edwmigration.dumper.application.dumper.MetadataDumperUsageException;
 import com.google.edwmigration.dumper.application.dumper.connector.Connector;
-import com.google.edwmigration.dumper.application.dumper.handle.Handle;
 import com.google.edwmigration.dumper.application.dumper.task.DumpMetadataTask;
 import com.google.edwmigration.dumper.application.dumper.task.FormatTask;
 import com.google.edwmigration.dumper.application.dumper.task.Task;
 import com.google.edwmigration.dumper.application.dumper.utils.ArchiveNameUtil;
-import java.sql.SQLException;
 import java.time.Clock;
 import java.util.List;
 import javax.annotation.Nonnull;
@@ -45,13 +43,6 @@ public SnowflakeLiteConnector() {
     super(NAME);
   }
 
-  @Override
-  @Nonnull
-  public Handle open(ConnectorArguments arguments)
-      throws MetadataDumperUsageException, SQLException {
-    return super.open(arguments);
-  }
-
   @Override
   @Nonnull
   public String getDefaultFileName(boolean isAssessment, @Nullable Clock clock) {
@@ -65,16 +56,14 @@ public String getDescription() {
   }
 
   @Override
-  public final void addTasksTo(List<? super Task<?>> out, ConnectorArguments arguments) {
+  public void addTasksTo(List<? super Task<?>> out, ConnectorArguments arguments) {
     out.add(new DumpMetadataTask(arguments, FORMAT_NAME));
     out.add(new FormatTask(FORMAT_NAME));
     out.addAll(planner.generateLiteSpecificQueries());
   }
 
   @Override
-  public final void validate(ConnectorArguments arguments) {
-    super.validate(arguments);
-
+  protected void validateForSnowflake(ConnectorArguments arguments) {
     if (!arguments.isAssessment()) {
       throw noAssessmentException();
     }

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

@@ -161,9 +161,7 @@ private TaskDescription(
   }
 
   @Override
-  public final void validate(@Nonnull ConnectorArguments arguments) {
-    super.validate(arguments);
-
+  protected final void validateForSnowflake(@Nonnull ConnectorArguments arguments) {
     if (arguments.isAssessment() && arguments.hasQueryLogEarliestTimestamp()) {
       throw unsupportedOption(ConnectorArguments.OPT_QUERY_LOG_EARLIEST_TIMESTAMP);
     }

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

@@ -129,6 +129,9 @@ public Iterable<ConnectorProperty> getPropertyConstants() {
     return builder.build();
   }
 
+  @Override
+  protected final void validateForSnowflake(@Nonnull ConnectorArguments arguments) {}
+
   private void addSqlTasksWithInfoSchemaFallback(
       @Nonnull List<? super Task<?>> out,
       @Nonnull Class<? extends Enum<?>> header,