Merge pull request #647 from GoogleCloudPlatform/603-java-template-re…

…dshifttogcs-empty-validateinput-method fix: java-template-redshifttogcs-empty-validateinput-method
GoogleCloudPlatform · May 11, 2023 · 4a4e32a · 4a4e32a
2 parents 40a9835 + f1fd17b
commit 4a4e32a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/java/src/main/java/com/google/cloud/dataproc/templates/databases/RedshiftToGCS.java b/java/src/main/java/com/google/cloud/dataproc/templates/databases/RedshiftToGCS.java
@@ -35,9 +35,8 @@ public RedshiftToGCS(RedshiftToGCSConfig config) {
 
   public static com.google.cloud.dataproc.templates.databases.RedshiftToGCS of(String... args) {
     RedshiftToGCSConfig config = RedshiftToGCSConfig.fromProperties(PropertyUtil.getProperties());
-    ValidationUtil.validateOrThrow(config);
     LOGGER.info("Config loaded\n{}", config);
-    return new com.google.cloud.dataproc.templates.databases.RedshiftToGCS(config);
+    return new RedshiftToGCS(config);
   }
 
   @Override
@@ -82,5 +81,8 @@ public void runTemplate() {
     spark.stop();
   }
 
-  public void validateInput() {}
+  @Override
+  public void validateInput() {
+    ValidationUtil.validateOrThrow(config);
+  }
 }
diff --git a/java/src/test/java/com/google/cloud/dataproc/templates/redshift/RedshiftToGCSTest.java b/java/src/test/java/com/google/cloud/dataproc/templates/redshift/RedshiftToGCSTest.java
@@ -21,12 +21,12 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.google.cloud.dataproc.templates.databases.RedshiftToGCS;
+import com.google.cloud.dataproc.templates.databases.RedshiftToGCSConfig;
 import com.google.cloud.dataproc.templates.util.PropertyUtil;
 import com.google.cloud.dataproc.templates.util.ValidationUtil.ValidationException;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.function.ThrowingSupplier;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
@@ -54,15 +54,20 @@ void setUp() {
   @Test
   void runTemplateWithValidParameters() {
     LOGGER.info("Running test: runTemplateWithValidParameters");
-    assertDoesNotThrow((ThrowingSupplier<RedshiftToGCS>) RedshiftToGCS::of);
+    RedshiftToGCSConfig config = RedshiftToGCSConfig.fromProperties(PropertyUtil.getProperties());
+    RedshiftToGCS template = new RedshiftToGCS(config);
+    assertDoesNotThrow(template::validateInput);
   }
 
   @ParameterizedTest
   @MethodSource("requiredPropertyKeys")
   void runTemplateWithMissingRequiredParameters(String propKey) {
     LOGGER.info("Running test: runTemplateWithInvalidParameters");
     PropertyUtil.getProperties().setProperty(propKey, "");
-    ValidationException exception = assertThrows(ValidationException.class, RedshiftToGCS::of);
+    RedshiftToGCSConfig config = RedshiftToGCSConfig.fromProperties(PropertyUtil.getProperties());
+    RedshiftToGCS template = new RedshiftToGCS(config);
+    ValidationException exception =
+        assertThrows(ValidationException.class, template::validateInput);
   }
 
   static Stream<String> requiredPropertyKeys() {