Merge pull request #79 from sumitnigamcs/PLUGIN-949

[PLUGIN-949] missing key value error msg

Author: rmstar

src/main/java/io/cdap/plugin/http/source/batch/HttpBatchSourceConfig.java

@@ -24,4 +24,113 @@ public class HttpBatchSourceConfig extends BaseHttpSourceConfig {
   protected HttpBatchSourceConfig(String referenceName) {
     super(referenceName);
   }
+
+  private HttpBatchSourceConfig(HttpBatchSourceConfigBuilder builder) {
+    super(builder.referenceName);
+    this.url = builder.url;
+    this.httpMethod = builder.httpMethod;
+    this.headers = builder.headers;
+    this.format = builder.format;
+    this.oauth2Enabled = builder.oauth2Enabled;
+    this.errorHandling = builder.errorHandling;
+    this.retryPolicy = builder.retryPolicy;
+    this.maxRetryDuration = builder.maxRetryDuration;
+    this.connectTimeout = builder.connectTimeout;
+    this.readTimeout = builder.readTimeout;
+    this.paginationType = builder.paginationType;
+    this.verifyHttps = builder.verifyHttps;
+  }
+
+  public static HttpBatchSourceConfigBuilder builder() {
+    return new HttpBatchSourceConfigBuilder();
+  }
+
+  /**
+   * Builder for HttpBatchSourceConfig
+   */
+  public static class HttpBatchSourceConfigBuilder {
+
+    private String referenceName;
+    private String url;
+    private String httpMethod;
+    private String headers;
+    private String format;
+    private String oauth2Enabled;
+    private String errorHandling;
+    private String retryPolicy;
+    private Long maxRetryDuration;
+    private Integer connectTimeout;
+    private Integer readTimeout;
+    private String paginationType;
+    private String verifyHttps;
+
+    public HttpBatchSourceConfigBuilder setReferenceName (String referenceName) {
+      this.referenceName = referenceName;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setUrl(String url) {
+      this.url = url;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setHttpMethod(String httpMethod) {
+      this.httpMethod = httpMethod;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setHeaders(String headers) {
+      this.headers = headers;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setFormat(String format) {
+      this.format = format;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setOauth2Enabled(String oauth2Enabled) {
+      this.oauth2Enabled = oauth2Enabled;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setErrorHandling(String errorHandling) {
+      this.errorHandling = errorHandling;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setRetryPolicy(String retryPolicy) {
+      this.retryPolicy = retryPolicy;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setMaxRetryDuration(Long maxRetryDuration) {
+      this.maxRetryDuration = maxRetryDuration;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setConnectTimeout(Integer connectTimeout) {
+      this.connectTimeout = connectTimeout;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setReadTimeout(Integer readTimeout) {
+      this.readTimeout = readTimeout;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setPaginationType(String paginationType) {
+      this.paginationType = paginationType;
+      return this;
+    }
+
+    public HttpBatchSourceConfigBuilder setVerifyHttps(String verifyHttps) {
+      this.verifyHttps = verifyHttps;
+      return this;
+    }
+
+    public HttpBatchSourceConfig build() {
+      return new HttpBatchSourceConfig(this);
+    }
+  }
 }

src/main/java/io/cdap/plugin/http/source/common/BaseHttpSourceConfig.java

@@ -870,6 +870,9 @@ public static Map<String, String> getMapFromKeyValueString(String keyValueString
     String[] mappings = keyValueString.split(",");
     for (String map : mappings) {
       String[] columns = map.split(":");
+      if (columns.length < 2) { //For scenario where either of key or value not provided
+        throw new IllegalArgumentException(String.format("Missing value for key %s", columns[0]));
+      }
       result.put(columns[0], columns[1]);
     }
     return result;

src/test/java/io/cdap/plugin/http/source/common/HttpBatchSourceConfigTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2022 Cask Data, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package io.cdap.plugin.http.source.common;
+
+import io.cdap.plugin.http.source.batch.HttpBatchSourceConfig;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
+/**
+ * Unit tests for HttpBatchSourceConfig
+ */
+public class HttpBatchSourceConfigTest {
+
+    @Test (expected = IllegalArgumentException.class)
+    public void testMissingKeyValue() {
+        HttpBatchSourceConfig config = HttpBatchSourceConfig.builder()
+                .setReferenceName("test").setUrl("http://localhost").setHttpMethod("GET").setHeaders("Auth:")
+                .setFormat("JSON").setOauth2Enabled("false").setErrorHandling(StringUtils.EMPTY)
+                .setRetryPolicy(StringUtils.EMPTY).setMaxRetryDuration(600L).setConnectTimeout(120)
+                .setReadTimeout(120).setPaginationType("NONE").setVerifyHttps("true").build();
+        config.validate();
+    }
+}