From 116b579c466335fc91deda37e61910e5fe656a51 Mon Sep 17 00:00:00 2001 From: Mehrdad Rahanjam Date: Thu, 6 Oct 2022 16:38:58 -0400 Subject: [PATCH] account for null reference names in validation --- .../features/fileplugin/sink/FileSinkErrorScenarios.feature | 1 - .../fileplugin/source/FileSourceErrorScenarios.feature | 1 - .../io/cdap/plugin/format/plugin/AbstractFileSinkConfig.java | 5 ++++- .../cdap/plugin/format/plugin/AbstractFileSourceConfig.java | 5 ++++- 4 files changed, 8 insertions(+), 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 index c639d28ed..c44559fe7 100644 --- 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 index 3a1a7cc6d..a13bdd8ef 100644 --- 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 index 4a337641c..83aacc82a 100644 --- 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 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 index 75a3095d6..1cba3b4d6 100644 --- 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) {