From e901f253293f5cb6490030b22d4e628fd66355c8 Mon Sep 17 00:00:00 2001 From: Victor Duvert Date: Fri, 21 Jan 2022 14:18:55 +0100 Subject: [PATCH] Don't use URL for validation if URL contains macros --- .../cdap/plugin/http/source/common/BaseHttpSourceConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/cdap/plugin/http/source/common/BaseHttpSourceConfig.java b/src/main/java/io/cdap/plugin/http/source/common/BaseHttpSourceConfig.java index a554dd6c..d39df125 100644 --- a/src/main/java/io/cdap/plugin/http/source/common/BaseHttpSourceConfig.java +++ b/src/main/java/io/cdap/plugin/http/source/common/BaseHttpSourceConfig.java @@ -683,7 +683,7 @@ public void validate() { } // Validate HTTP Error Handling Map - if (!containsMacro(PROPERTY_HTTP_ERROR_HANDLING)) { + if (!containsMacro(PROPERTY_HTTP_ERROR_HANDLING) && !containsMacro(PROPERTY_URL)) { List httpErrorsHandlingEntries = getHttpErrorHandlingEntries(); boolean supportsSkippingPages = PaginationIteratorFactory .createInstance(this, null).supportsSkippingPages(); @@ -741,7 +741,7 @@ public void validate() { propertiesShouldBeNull.remove(PROPERTY_INDEX_INCREMENT)); propertiesShouldBeNull.remove(PROPERTY_MAX_INDEX); // can be both null and non null - if (!url.contains(PAGINATION_INDEX_PLACEHOLDER)) { + if (!containsMacro(PROPERTY_URL) && !url.contains(PAGINATION_INDEX_PLACEHOLDER)) { throw new InvalidConfigPropertyException( String.format("Url '%s' must contain '%s' placeholder when pagination type is '%s'", getUrl(), PAGINATION_INDEX_PLACEHOLDER, getPaginationType()),