Make validateDateRange non-default

Author: misolt

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

@@ -54,7 +54,7 @@ default String getDescription() {
   @OverridingMethodsMustInvokeSuper
   default void validate(@Nonnull ConnectorArguments arguments) {}
 
-  default void validateDateRange(ConnectorArguments arguments) {
+  static void validateDateRange(@Nonnull ConnectorArguments arguments) {
     ZonedDateTime startDate = arguments.getStartDate();
     ZonedDateTime endDate = arguments.getEndDate();
 

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

@@ -236,7 +236,7 @@ public void validate(@Nonnull ConnectorArguments arguments) {
       Preconditions.checkState(arguments.getSchema() != null, "--schema is required with --host");
     }
 
-    validateDateRange(arguments);
+    Connector.validateDateRange(arguments);
   }
 
   @Nonnull

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

@@ -137,7 +137,7 @@ public void validate(@Nonnull ConnectorArguments arguments) {
     Preconditions.checkNotNull(
         clouderaUser, "--user is required for Cloudera Manager API connector");
 
-    validateDateRange(arguments);
+    Connector.validateDateRange(arguments);
   }
 
   private void doClouderaManagerLogin(

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

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

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

@@ -16,101 +16,62 @@
  */
 package com.google.edwmigration.dumper.application.dumper.connector;
 
+import static com.google.edwmigration.dumper.application.dumper.connector.Connector.validateDateRange;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
 
 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.time.Clock;
-import java.util.List;
-import javax.annotation.Nonnull;
 import org.junit.Test;
 
 public class ConnectorTest {
-  private final Connector connector = new EmptyConnector();
 
   @Test
   public void validateDateRange_startDateAndEndDate_success() throws Exception {
-    String argsStr = "--connector test --start-date=2001-02-20 --end-date=2001-02-25";
+    ConnectorArguments args =
+        new ConnectorArguments(
+            "--connector", "test", "--start-date=2001-02-20", "--end-date=2001-02-25");
 
     // Act
-    connector.validateDateRange(toArgs(argsStr));
+    validateDateRange(args);
   }
 
   @Test
-  public void validateDateRange_startDateAfterEndDate_throws() {
-    String argsStr = "--connector test --start-date=2001-02-20 --end-date=2001-02-20";
+  public void validateDateRange_startDateAfterEndDate_throws() throws Exception {
+    ConnectorArguments args =
+        new ConnectorArguments(
+            "--connector", "test", "--start-date=2001-02-20", "--end-date=2001-02-20");
 
     Exception exception =
-        assertThrows(
-            IllegalStateException.class, () -> connector.validateDateRange(toArgs(argsStr)));
+        assertThrows(IllegalStateException.class, () -> Connector.validateDateRange(args));
     assertEquals(
         "Start date [2001-02-20T00:00Z] must be before end date [2001-02-20T00:00Z].",
         exception.getMessage());
   }
 
   @Test
-  public void validateDateRange_endDateAlone_throws() {
-    String argsStr = "--connector test --end-date=2001-02-20";
+  public void validateDateRange_endDateAlone_throws() throws Exception {
+    ConnectorArguments args =
+        new ConnectorArguments("--connector", "test", "--end-date=2001-02-20");
 
-    Exception exception =
-        assertThrows(
-            IllegalStateException.class, () -> connector.validateDateRange(toArgs(argsStr)));
+    Exception exception = assertThrows(IllegalStateException.class, () -> validateDateRange(args));
     assertEquals(
         "End date can be specified only with start date, but start date was null.",
         exception.getMessage());
   }
 
   @Test
-  public void validateDateRange_startDateAlone_throws() {
-    String argsStr = "--connector test --start-date=2001-02-20";
+  public void validateDateRange_startDateAlone_throws() throws Exception {
+    ConnectorArguments args =
+        new ConnectorArguments("--connector", "test", "--start-date=2001-02-20");
 
-    Exception exception =
-        assertThrows(RuntimeException.class, () -> connector.validateDateRange(toArgs(argsStr)));
+    Exception exception = assertThrows(RuntimeException.class, () -> validateDateRange(args));
     assertEquals(
         "End date must be specified with start date, but was null.", exception.getMessage());
   }
 
   @Test
   public void validateDateRange_requiredArgs_success() throws Exception {
     // Act
-    connector.validateDateRange(toArgs("--connector test"));
-  }
-
-  private static class EmptyConnector implements Connector {
-
-    @Nonnull
-    @Override
-    public String getName() {
-      return null;
-    }
-
-    @Nonnull
-    @Override
-    public String getDefaultFileName(boolean isAssessment, Clock clock) {
-      return null;
-    }
-
-    @Override
-    public void addTasksTo(
-        @Nonnull List<? super Task<?>> out, @Nonnull ConnectorArguments arguments)
-        throws Exception {}
-
-    @Nonnull
-    @Override
-    public Handle open(@Nonnull ConnectorArguments arguments) throws Exception {
-      return null;
-    }
-
-    @Nonnull
-    @Override
-    public Iterable<ConnectorProperty> getPropertyConstants() {
-      return null;
-    }
-  }
-
-  private static ConnectorArguments toArgs(String args) throws Exception {
-    return new ConnectorArguments(args.split(" "));
+    validateDateRange(new ConnectorArguments("--connector", "test"));
   }
 }