Refactor: Simplify error message for invalid write preference validation

data-integrations · Dec 12, 2024 · 1a239a4 · 1a239a4
1 parent a110759
commit 1a239a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecute.java b/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecute.java
@@ -576,11 +576,8 @@ void validateWritePreference(FailureCollector failureCollector, String writePref
       );
       if (!validPreferences.contains(writePreference)) {
         failureCollector.addFailure(
-            String.format("Invalid write preference '%s'. Allowed values are '%s', '%s', or '%s'.",
-                writePreference,
-                JobInfo.WriteDisposition.WRITE_EMPTY.name(),
-                JobInfo.WriteDisposition.WRITE_APPEND.name(),
-                JobInfo.WriteDisposition.WRITE_TRUNCATE.name()
+            String.format("Invalid write preference '%s'. Allowed values are '%s'.",
+                writePreference, validPreferences.toString()
             ),
             "Please provide a valid write preference."
         )

diff --git a/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecuteTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecuteTest.java
@@ -25,6 +25,7 @@
 import com.google.cloud.bigquery.JobStatus;
 import com.google.cloud.bigquery.QueryJobConfiguration;
 import com.google.cloud.bigquery.TableResult;
+import com.google.common.collect.ImmutableSet;
 import io.cdap.cdap.api.metrics.Metrics;
 import io.cdap.cdap.etl.api.StageMetrics;
 import io.cdap.cdap.etl.api.action.ActionContext;
@@ -37,6 +38,7 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import java.util.Set;
 
 public class BigQueryExecuteTest {
   @Mock
@@ -228,15 +230,18 @@ public void testValidateRetryConfigurationWithInvalidReadTimeout() {
 
   @Test
   public void testValidateWritePreferenceWithInvalidValue() {
+    Set<String> validPreferences = ImmutableSet.of(
+        JobInfo.WriteDisposition.WRITE_EMPTY.name(),
+        JobInfo.WriteDisposition.WRITE_APPEND.name(),
+        JobInfo.WriteDisposition.WRITE_TRUNCATE.name()
+    );
     config.validateWritePreference(failureCollector, "INVALID_PREFERENCE");
 
     // Assert validation failure
     Assert.assertEquals(1, failureCollector.getValidationFailures().size());
     Assert.assertEquals(
-        String.format("Invalid write preference 'INVALID_PREFERENCE'. Allowed values are '%s', '%s', or '%s'.",
-            JobInfo.WriteDisposition.WRITE_EMPTY.name(),
-            JobInfo.WriteDisposition.WRITE_APPEND.name(),
-            JobInfo.WriteDisposition.WRITE_TRUNCATE.name()
+        String.format("Invalid write preference 'INVALID_PREFERENCE'. Allowed values are '%s'.",
+            validPreferences.toString()
         ),
         failureCollector.getValidationFailures().get(0).getMessage()
     );