account for null reference names in validation

cdapio · Oct 7, 2022 · 116b579 · 116b579
1 parent fa251ed
commit 116b579
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/core-plugins/src/e2e-test/features/fileplugin/sink/FileSinkErrorScenarios.feature b/core-plugins/src/e2e-test/features/fileplugin/sink/FileSinkErrorScenarios.feature
@@ -8,6 +8,5 @@ Feature:File Sink - Verify File Sink Plugin Error scenarios
     Then Navigate to the properties page of plugin: "File"
     Then Click on the Validate button
     Then Verify mandatory property error for below listed properties:
-      | referenceName |
       | path          |
       | format        |
diff --git a/core-plugins/src/e2e-test/features/fileplugin/source/FileSourceErrorScenarios.feature b/core-plugins/src/e2e-test/features/fileplugin/source/FileSourceErrorScenarios.feature
@@ -8,7 +8,6 @@ Feature:File Source - Verify File Source Plugin Error scenarios
     Then Navigate to the properties page of plugin: "File"
     Then Click on the Validate button
     Then Verify mandatory property error for below listed properties:
-      | referenceName |
       | path          |
       | format        |
 

diff --git a/format-common/src/main/java/io/cdap/plugin/format/plugin/AbstractFileSinkConfig.java b/format-common/src/main/java/io/cdap/plugin/format/plugin/AbstractFileSinkConfig.java
@@ -41,6 +41,7 @@ public abstract class AbstractFileSinkConfig extends PluginConfig implements Fil
   public static final String NAME_SUFFIX = "suffix";
 
   @Description("Name be used to uniquely identify this sink for lineage, annotating metadata, etc.")
+  @Nullable
   private String referenceName;
 
   @Macro
@@ -85,7 +86,9 @@ public void validate(FailureCollector collector) {
   }
 
   public void validate(FailureCollector collector, Map<String, String> arguments) {
-    IdUtils.validateReferenceName(referenceName, collector);
+    if (!Strings.isNullOrEmpty(referenceName)) {
+      IdUtils.validateReferenceName(referenceName, collector);
+    }
     if (suffix != null && !containsMacro(NAME_SUFFIX)) {
       try {
         new SimpleDateFormat(suffix);

diff --git a/format-common/src/main/java/io/cdap/plugin/format/plugin/AbstractFileSourceConfig.java b/format-common/src/main/java/io/cdap/plugin/format/plugin/AbstractFileSourceConfig.java
@@ -42,6 +42,7 @@ public abstract class AbstractFileSourceConfig extends PluginConfig implements F
   public static final String DEFAULT_FILE_ENCODING = "UTF-8";
 
   @Description("Name be used to uniquely identify this source for lineage, annotating metadata, etc.")
+  @Nullable
   private String referenceName;
 
   @Macro
@@ -141,7 +142,9 @@ public void validate() {
   }
 
   public void validate(FailureCollector collector) {
-    IdUtils.validateReferenceName(referenceName, collector);
+    if (!Strings.isNullOrEmpty(referenceName)) {
+      IdUtils.validateReferenceName(referenceName, collector);
+    }
     try {
       getSchema();
     } catch (IllegalArgumentException e) {