From 28bff1949c49466b5a926eeb87b4eea0e3beeec5 Mon Sep 17 00:00:00 2001
From: dgrinenko <dgrinenko@cybervisiontech.com>
Date: Tue, 14 Dec 2021 13:41:20 +0200
Subject: [PATCH 1/5] Add possibility to use particular certificate for client
 during 2 way ssl connection

---
 docs/HTTP-batchsource.md                      | 14 +++
 docs/HTTP-streamingsource.md                  | 14 +++
 pom.xml                                       | 20 ++++-
 .../source/common/BaseHttpSourceConfig.java   | 13 +++
 .../SSLConnectionSocketFactoryCreator.java    | 52 ++++++-----
 .../http/X509KeyManagerAliasWrapper.java      | 87 +++++++++++++++++++
 widgets/HTTP-batchsource.json                 |  5 ++
 widgets/HTTP-streamingsource.json             |  5 ++
 8 files changed, 187 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/io/cdap/plugin/http/source/common/http/X509KeyManagerAliasWrapper.java

diff --git a/docs/HTTP-batchsource.md b/docs/HTTP-batchsource.md
index 37ed1e2d..1e227869 100644
--- a/docs/HTTP-batchsource.md
+++ b/docs/HTTP-batchsource.md
@@ -403,6 +403,20 @@ error. Do not disable this in production environment on a network you do not ent
 
 **Keystore Key Algorithm:** An algorithm used for keystore.
 
+**Keystore Cert Alias**
+
+ Alias of the key in the keystore to be used for communication. This options is supported only by X.509 keys or keystores.
+ 
+Below is an example how the store need to be prepared:
+ ```
+ cat  client.crt client.key > client-bundle.pem
+
+ openssl pkcs12 -export -in client-bundle.pem -out full-chain.keycert.p12 -name ${CERT_ALIAS}
+
+ keytool -importkeystore -srckeystore full-chain.keycert.p12 -srcstoretype pkcs12 -srcalias ${CERT_ALIAS} \
+                         -destkeystore identity.jks -deststoretype jks -destalias ${CERT_ALIAS}
+ ```
+
 **TrustStore File:** A path to a file which contains truststore.
 
 **TrustStore Type:** Format of a truststore.
diff --git a/docs/HTTP-streamingsource.md b/docs/HTTP-streamingsource.md
index 4cad538e..eafe35f6 100644
--- a/docs/HTTP-streamingsource.md
+++ b/docs/HTTP-streamingsource.md
@@ -410,6 +410,20 @@ error. Do not disable this in production environment on a network you do not ent
 
 **Keystore Key Algorithm:** An algorithm used for keystore.
 
+**Keystore Cert Alias**
+
+Alias of the key in the keystore to be used for communication. This options is supported only by X.509 keys or keystores.
+
+Below is an example how the store need to be prepared:
+ ```
+ cat  client.crt client.key > client-bundle.pem
+
+ openssl pkcs12 -export -in client-bundle.pem -out full-chain.keycert.p12 -name ${CERT_ALIAS}
+
+ keytool -importkeystore -srckeystore full-chain.keycert.p12 -srcstoretype pkcs12 -srcalias ${CERT_ALIAS} \
+                         -destkeystore identity.jks -deststoretype jks -destalias ${CERT_ALIAS}
+ ```
+
 **TrustStore File:** A path to a file which contains truststore.
 
 **TrustStore Type:** Format of a truststore.
diff --git a/pom.xml b/pom.xml
index d49ef2e5..80bf3875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <name>HTTP Plugins</name>
   <groupId>io.cdap</groupId>
   <artifactId>http-plugins</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.4.1-SNAPSHOT</version>
 
   <licenses>
     <license>
@@ -79,10 +79,12 @@
     <cdap.version>6.1.1</cdap.version>
     <commons.version>3.9</commons.version>
     <common.codec.version>1.12</common.codec.version>
+    <common.logging.version>1.2</common.logging.version>
+    <log4j.version>1.2.17</log4j.version>
     <gson.version>2.8.5</gson.version>
     <hadoop.version>2.3.0</hadoop.version>
     <httpcomponents.version>4.5.9</httpcomponents.version>
-    <hydrator.version>2.4.0-SNAPSHOT</hydrator.version>
+    <hydrator.version>2.4.0</hydrator.version>
     <jackson.version>2.9.9</jackson.version>
     <junit.version>4.11</junit.version>
     <jython.version>2.7.1</jython.version>
@@ -93,6 +95,20 @@
   </properties>
 
   <dependencies>
+    <!-- Required to work properly on external hadoop clusters-->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${common.logging.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+     <groupId>log4j</groupId>
+     <artifactId>log4j</artifactId>
+     <version>${log4j.version}</version>
+     <scope>compile</scope>
+    </dependency>
+    <!-- / end required -->
     <dependency>
       <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-api</artifactId>
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..9c21627a 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
@@ -100,6 +100,8 @@ public abstract class BaseHttpSourceConfig extends ReferencePluginConfig {
   public static final String PROPERTY_CIPHER_SUITES = "cipherSuites";
   public static final String PROPERTY_SCHEMA = "schema";
 
+  public static final String PROPERTY_KEYSTORE_CERT_ALIAS = "keystoreCertAlias";
+
   public static final String PAGINATION_INDEX_PLACEHOLDER_REGEX = "\\{pagination.index\\}";
   public static final String PAGINATION_INDEX_PLACEHOLDER = "{pagination.index}";
 
@@ -390,6 +392,12 @@ public abstract class BaseHttpSourceConfig extends ReferencePluginConfig {
   @Description("Output schema. Is required to be set.")
   protected String schema;
 
+  @Name(PROPERTY_KEYSTORE_CERT_ALIAS)
+  @Macro
+  @Nullable
+  @Description("Alias of the key in the keystore to be used for communication")
+  protected String keystoreCertAliasName;
+
   protected BaseHttpSourceConfig(String referenceName) {
     super(referenceName);
   }
@@ -627,6 +635,11 @@ public Schema getSchema() {
     }
   }
 
+  @Nullable
+  public String getKeystoreCertAliasName() {
+    return keystoreCertAliasName;
+  }
+
   @Nullable
   public Map<String, String> getHeadersMap() {
     return getMapFromKeyValueString(headers);
diff --git a/src/main/java/io/cdap/plugin/http/source/common/http/SSLConnectionSocketFactoryCreator.java b/src/main/java/io/cdap/plugin/http/source/common/http/SSLConnectionSocketFactoryCreator.java
index 1883f9ba..3cae7de4 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/http/SSLConnectionSocketFactoryCreator.java
+++ b/src/main/java/io/cdap/plugin/http/source/common/http/SSLConnectionSocketFactoryCreator.java
@@ -59,6 +59,7 @@ public SSLConnectionSocketFactory create() {
       SSLContext sslContext = SSLContext.getInstance("TLS"); // "TLS" means rely system properties
       sslContext.init(getKeyManagers(), getTrustManagers(), null);
 
+
       return new SSLConnectionSocketFactory(sslContext, config.getTransportProtocolsList().toArray(new String[0]),
                                             cipherSuites, SSLConnectionSocketFactory.getDefaultHostnameVerifier());
     } catch (KeyManagementException | CertificateException | NoSuchAlgorithmException | KeyStoreException
@@ -70,27 +71,30 @@ public SSLConnectionSocketFactory create() {
   private KeyManager[] getKeyManagers() throws CertificateException, NoSuchAlgorithmException,
     KeyStoreException, IOException, UnrecoverableKeyException {
 
-    KeyStore keystore = loadKeystore(config.getKeystoreFile(), config.getKeystoreType().name(),
-                                     config.getKeystorePassword());
-
     String keyStorePassword = config.getKeystorePassword();
+    KeyStore keystore = loadKeystore(config.getKeystoreFile(), config.getKeystoreType().name(), keyStorePassword);
 
     // we have to manually fall back to default keystore. SSLContext won't provide such a functionality.
     if (keystore == null) {
       String keyStore = System.getProperty("javax.net.ssl.keyStore");
       String keyStoreType = System.getProperty("javax.net.ssl.keyStoreType", KeyStore.getDefaultType());
       keyStorePassword = System.getProperty("javax.net.ssl.keyStorePassword", "");
-
       keystore = loadKeystore(keyStore, keyStoreType, keyStorePassword);
     }
 
-    String keystoreAlgorithm =
-      (Strings.isNullOrEmpty(config.getKeystoreKeyAlgorithm())) ? KeyManagerFactory.getDefaultAlgorithm()
+    String keystoreAlgorithm = (Strings.isNullOrEmpty(config.getKeystoreKeyAlgorithm()))
+        ? KeyManagerFactory.getDefaultAlgorithm()
         : config.getKeystoreKeyAlgorithm();
+
     KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(keystoreAlgorithm);
-    char[] passwordArr = (keyStorePassword == null) ? null : keyStorePassword.toCharArray();
-    keyManagerFactory.init(keystore, passwordArr);
-    return keyManagerFactory.getKeyManagers();
+    keyManagerFactory.init(
+      keystore,
+      (keyStorePassword == null) ? null : keyStorePassword.toCharArray()
+    );
+
+    return (Strings.isNullOrEmpty(config.getKeystoreCertAliasName()))
+      ? keyManagerFactory.getKeyManagers()
+      : X509KeyManagerAliasWrapper.getKeyManagers(keyManagerFactory, config.getKeystoreCertAliasName());
   }
 
   private TrustManager[] getTrustManagers()
@@ -100,13 +104,17 @@ private TrustManager[] getTrustManagers()
       return new TrustManager[] { new TrustAllTrustManager() };
     }
 
-    KeyStore trustStore = loadKeystore(config.getTrustStoreFile(), config.getTrustStoreType().name(),
-                                       config.getTrustStorePassword());
+    KeyStore trustStore = loadKeystore(
+      config.getTrustStoreFile(),
+      config.getTrustStoreType().name(),
+      config.getTrustStorePassword()
+    );
+
     TrustManager[] trustManagers = null;
     if (trustStore != null) {
-      String trustStoreAlgorithm =
-        (Strings.isNullOrEmpty(config.getTrustStoreKeyAlgorithm())) ? TrustManagerFactory.getDefaultAlgorithm()
-          : config.getTrustStoreKeyAlgorithm();
+      String trustStoreAlgorithm = (Strings.isNullOrEmpty(config.getTrustStoreKeyAlgorithm()))
+        ? TrustManagerFactory.getDefaultAlgorithm()
+        : config.getTrustStoreKeyAlgorithm();
       TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(trustStoreAlgorithm);
       trustManagerFactory.init(trustStore);
       trustManagers = trustManagerFactory.getTrustManagers();
@@ -117,13 +125,15 @@ private TrustManager[] getTrustManagers()
   private static KeyStore loadKeystore(String keystoreFile, String type, String password)
     throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException {
 
-    KeyStore keystore = null;
-    if (keystoreFile != null) {
-      keystore = KeyStore.getInstance(type);
-      char[] passwordArr = (password == null) ? null : password.toCharArray();
-      try (InputStream is = Files.newInputStream(Paths.get(keystoreFile))) {
-        keystore.load(is, passwordArr);
-      }
+    if (keystoreFile == null) {
+      return null;
+    }
+
+    KeyStore keystore = KeyStore.getInstance(type);
+    char[] passwordArr = (password == null) ? null : password.toCharArray();
+
+    try (InputStream is = Files.newInputStream(Paths.get(keystoreFile))) {
+      keystore.load(is, passwordArr);
     }
     return keystore;
   }
diff --git a/src/main/java/io/cdap/plugin/http/source/common/http/X509KeyManagerAliasWrapper.java b/src/main/java/io/cdap/plugin/http/source/common/http/X509KeyManagerAliasWrapper.java
new file mode 100644
index 00000000..16dc553a
--- /dev/null
+++ b/src/main/java/io/cdap/plugin/http/source/common/http/X509KeyManagerAliasWrapper.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2021 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.http;
+
+import java.net.Socket;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.X509KeyManager;
+
+
+/**
+ * This is just wrapper over SunX509KeyManagerImpl with possibility to provide specific alias
+ *
+ * Usage example:
+ *    X509KeyManagerAliasWrapper.getKeyManagers(keyManagerFactory, CERT_ALIAS);
+ */
+public class X509KeyManagerAliasWrapper implements X509KeyManager  {
+
+  private final X509KeyManager originalKeyManager;
+  private final String certAlias;
+
+  public X509KeyManagerAliasWrapper(X509KeyManager originalKeyManager, String certAlias) {
+    this.originalKeyManager = originalKeyManager;
+    this.certAlias = certAlias;
+  }
+
+  public static KeyManager[] getKeyManagers(KeyManagerFactory keyManagerFactory, String certAlias) {
+    KeyManager[] keyManagers = keyManagerFactory.getKeyManagers();
+
+    // Current implementation only support X509 Certificates
+    if (keyManagers.length != 1) {
+      return keyManagers;
+    }
+    if (!(keyManagers[0] instanceof X509KeyManager)) {
+      return keyManagers;
+    }
+
+   return new KeyManager[]{ new X509KeyManagerAliasWrapper((X509KeyManager) keyManagers[0], certAlias) };
+ };
+
+  @Override
+  public String chooseClientAlias(String[] strings, Principal[] principals, Socket socket) {
+    return certAlias;
+  }
+
+  @Override
+  public String[] getClientAliases(String s, Principal[] principals) {
+    return originalKeyManager.getClientAliases(s, principals);
+  }
+
+  @Override
+  public String[] getServerAliases(String s, Principal[] principals) {
+    return originalKeyManager.getServerAliases(s, principals);
+  }
+
+  @Override
+  public String chooseServerAlias(String s, Principal[] principals, Socket socket) {
+    return originalKeyManager.chooseServerAlias(s, principals, socket);
+  }
+
+  @Override
+  public X509Certificate[] getCertificateChain(String s) {
+    return originalKeyManager.getCertificateChain(s);
+  }
+
+  @Override
+  public PrivateKey getPrivateKey(String s) {
+    return originalKeyManager.getPrivateKey(s);
+  }
+}
diff --git a/widgets/HTTP-batchsource.json b/widgets/HTTP-batchsource.json
index 6c053781..fd612166 100644
--- a/widgets/HTTP-batchsource.json
+++ b/widgets/HTTP-batchsource.json
@@ -426,6 +426,11 @@
             "default": "SunX509"
           }
         },
+        {
+          "widget-type": "textbox",
+          "label": "Keystore Cert Alias",
+          "name": "keystoreCertAlias"
+        },
         {
           "widget-type": "textbox",
           "label": "TrustStore File",
diff --git a/widgets/HTTP-streamingsource.json b/widgets/HTTP-streamingsource.json
index e7abdb68..798a6fed 100644
--- a/widgets/HTTP-streamingsource.json
+++ b/widgets/HTTP-streamingsource.json
@@ -425,6 +425,11 @@
             "default": "SunX509"
           }
         },
+        {
+          "widget-type": "textbox",
+          "label": "Keystore Cert Alias",
+          "name": "keystoreCertAlias"
+        },
         {
           "widget-type": "textbox",
           "label": "TrustStore File",

From 36da5d627aa6c76c6376bdd26139286de724b053 Mon Sep 17 00:00:00 2001
From: dgrinenko <dgrinenko@cybervisiontech.com>
Date: Wed, 15 Dec 2021 11:33:24 +0200
Subject: [PATCH 2/5] initial

---
 docs/HTTP-action.md                           | 119 +++++
 icons/HTTP-action.png                         | Bin 0 -> 2321 bytes
 pom.xml                                       |   2 +-
 .../cdap/plugin/http/action/HttpAction.java   |  84 ++++
 .../plugin/http/action/HttpActionConfig.java  | 475 ++++++++++++++++++
 .../common/BaseHttpSourceConfig.java          |  20 +-
 .../{source => }/common/EnumWithValue.java    |   2 +-
 .../http/{source => }/common/RetryPolicy.java |   2 +-
 .../common/error/ErrorHandling.java           |   4 +-
 .../common/error/HttpErrorHandler.java        |   8 +-
 .../common/error/HttpErrorHandlerEntity.java  |   2 +-
 .../common/error/RetryableErrorHandling.java  |   4 +-
 .../{source => }/common/http/HttpClient.java  |   8 +-
 .../http/common/http/HttpConstants.java       |  63 +++
 .../common/http/HttpResponse.java             |   2 +-
 .../plugin/http/common/http/IHttpConfig.java  | 124 +++++
 .../common/http/KeyStoreType.java             |   4 +-
 .../{source => }/common/http/OAuthUtil.java   |   4 +-
 .../SSLConnectionSocketFactoryCreator.java    |  12 +-
 .../common/http/TrustAllTrustManager.java     |   2 +-
 .../http/X509KeyManagerAliasWrapper.java      |   2 +-
 .../BaseHttpPaginationIterator.java           |  26 +-
 .../pagination/CustomPaginationIterator.java  |  10 +-
 .../IncrementAnIndexPaginationIterator.java   |  12 +-
 .../pagination/JythonPythonExecutor.java      |   2 +-
 .../LinkInResponseBodyPaginationIterator.java |  10 +-
 ...inkInResponseHeaderPaginationIterator.java |  10 +-
 .../pagination/NonePaginationIterator.java    |  10 +-
 .../pagination/PaginationIteratorFactory.java |   6 +-
 .../common/pagination/PaginationType.java     |   4 +-
 .../pagination/TokenPaginationIterator.java   |  10 +-
 .../common/pagination/page/BasePage.java      |   4 +-
 .../common/pagination/page/BlobPage.java      |   6 +-
 .../common/pagination/page/DelimitedPage.java |   6 +-
 .../common/pagination/page/HttpErrorPage.java |  10 +-
 .../pagination/page/InvalidEntryCreator.java  |   2 +-
 .../common/pagination/page/JSONUtil.java      |   2 +-
 .../common/pagination/page/JsonPage.java      |   6 +-
 .../common/pagination/page/PageEntry.java     |   4 +-
 .../common/pagination/page/PageFactory.java   |   8 +-
 .../common/pagination/page/PageFormat.java    |   4 +-
 .../pagination/page/RecordPerLinePage.java    |   6 +-
 .../common/pagination/page/TextPage.java      |   6 +-
 .../common/pagination/page/XmlPage.java       |   6 +-
 .../common/pagination/page/XmlUtil.java       |   2 +-
 .../state/IndexPaginationIteratorState.java   |   4 +-
 .../state/PaginationIteratorState.java        |   2 +-
 .../state/UrlPaginationIteratorState.java     |   2 +-
 .../cdap/plugin/http/sink/batch/HTTPSink.java |   4 +-
 .../http/source/batch/HttpBatchSource.java    |   9 +-
 .../source/batch/HttpBatchSourceConfig.java   |   2 +-
 .../http/source/batch/HttpInputFormat.java    |   2 +-
 .../http/source/batch/HttpRecordReader.java   |   6 +-
 .../source/streaming/HttpInputDStream.java    |   8 +-
 .../source/streaming/HttpStreamingSource.java |   5 +-
 .../streaming/HttpStreamingSourceConfig.java  |   2 +-
 .../pagination/PaginationIteratorTest.java    |  14 +-
 .../common/pagination/page/JSONUtilTest.java  |   2 +-
 .../http/etl/BaseHttpBatchSourceETLTest.java  |   2 +-
 .../plugin/http/etl/HttpSourceETLTest.java    |   2 +-
 widgets/HTTP-action.json                      | 443 ++++++++++++++++
 61 files changed, 1465 insertions(+), 159 deletions(-)
 create mode 100644 docs/HTTP-action.md
 create mode 100644 icons/HTTP-action.png
 create mode 100644 src/main/java/io/cdap/plugin/http/action/HttpAction.java
 create mode 100644 src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java
 rename src/main/java/io/cdap/plugin/http/{source => }/common/BaseHttpSourceConfig.java (97%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/EnumWithValue.java (94%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/RetryPolicy.java (95%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/error/ErrorHandling.java (91%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/error/HttpErrorHandler.java (89%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/error/HttpErrorHandlerEntity.java (96%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/error/RetryableErrorHandling.java (94%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/http/HttpClient.java (96%)
 create mode 100644 src/main/java/io/cdap/plugin/http/common/http/HttpConstants.java
 rename src/main/java/io/cdap/plugin/http/{source => }/common/http/HttpResponse.java (98%)
 create mode 100644 src/main/java/io/cdap/plugin/http/common/http/IHttpConfig.java
 rename src/main/java/io/cdap/plugin/http/{source => }/common/http/KeyStoreType.java (91%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/http/OAuthUtil.java (94%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/http/SSLConnectionSocketFactoryCreator.java (93%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/http/TrustAllTrustManager.java (95%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/http/X509KeyManagerAliasWrapper.java (98%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/BaseHttpPaginationIterator.java (89%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/CustomPaginationIterator.java (85%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/IncrementAnIndexPaginationIterator.java (84%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/JythonPythonExecutor.java (98%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/LinkInResponseBodyPaginationIterator.java (86%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/LinkInResponseHeaderPaginationIterator.java (85%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/NonePaginationIterator.java (78%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/PaginationIteratorFactory.java (89%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/PaginationType.java (91%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/TokenPaginationIterator.java (85%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/BasePage.java (90%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/BlobPage.java (91%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/DelimitedPage.java (90%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/HttpErrorPage.java (88%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/InvalidEntryCreator.java (97%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/JSONUtil.java (99%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/JsonPage.java (97%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/PageEntry.java (92%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/PageFactory.java (87%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/PageFormat.java (89%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/RecordPerLinePage.java (93%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/TextPage.java (87%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/XmlPage.java (95%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/page/XmlUtil.java (98%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/state/IndexPaginationIteratorState.java (89%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/state/PaginationIteratorState.java (92%)
 rename src/main/java/io/cdap/plugin/http/{source => }/common/pagination/state/UrlPaginationIteratorState.java (95%)
 rename src/test/java/io/cdap/plugin/http/{source => }/common/pagination/PaginationIteratorTest.java (96%)
 rename src/test/java/io/cdap/plugin/http/{source => }/common/pagination/page/JSONUtilTest.java (98%)
 create mode 100644 widgets/HTTP-action.json

diff --git a/docs/HTTP-action.md b/docs/HTTP-action.md
new file mode 100644
index 00000000..3073d02c
--- /dev/null
+++ b/docs/HTTP-action.md
@@ -0,0 +1,119 @@
+# HTTP Action
+
+Description
+-----------
+This plugin executing HTTP/HTTPS requests
+
+Properties
+----------
+
+### General
+
+**URL:** Url to fetch to the first page.
+The url must start with a protocol (e.g. http://).
+
+**HTTP Method:** HTTP request method.
+
+**Headers:** Headers to send with each HTTP request.
+
+**Request body:** Body to send with each HTTP request.
+
+
+### Basic Authentication
+
+**Username:** Username for basic authentication.
+
+**Password:** Password for basic authentication.
+
+### HTTP Proxy
+
+**Proxy URL:** Proxy URL. Must contain a protocol, address and port.
+
+**Username:** Proxy username.
+
+**Password:** Proxy password.
+
+### Error Handling
+
+**HTTP Errors Handling:** Defines the error handling strategy to use for certain HTTP response codes.
+The left column contains a regular expression for HTTP status code. The right column contains an action which
+is done in case of match. If HTTP status code matches multiple regular expressions, the first specified in mapping
+is matched.
+
+Example:
+
+| HTTP Code Regexp  | Error Handling          |
+| ----------------- |:-----------------------:|
+| 2..               | Success                 |
+| 401               | Retry and fail          |
+| 4..               | Fail                    |
+| 5..               | Retry and send to error |
+| .*                | Fail                    |
+
+Note: pagination types "Link in response header", "Link in response body", "Token in response body" do not support
+"Send to error", "Skip", "Retry and send to error", "Retry and skip" options.
+
+**Non-HTTP Error Handling:** Error handling strategy to use when the HTTP response cannot be transformed to an output record.
+Possible values are:<br>
+Stop on error - Fails pipeline due to erroneous record.<br>
+Send to error - Sends erroneous record's text to error port and continues.<br>
+Skip on error - Ignores erroneous records.
+
+**Connect Timeout:** Maximum time in seconds connection initialization is allowed to take.
+
+### OAuth2
+
+**OAuth2 Enabled:** If true, plugin will perform OAuth2 authentication.
+
+**Auth URL:** Endpoint for the authorization server used to retrieve the authorization code.
+
+**Token URL:** Endpoint for the resource server, which exchanges the authorization code for an access token.
+
+**Client ID:** Client identifier obtained during the Application registration process.
+
+**Client Secret:** Client secret obtained during the Application registration process.
+
+**Scopes:** Scope of the access request, which might have multiple space-separated values.
+
+**Refresh Token:** Token used to receive accessToken, which is end product of OAuth2.
+
+### SSL/TLS
+
+**Verify HTTPS Trust Certificates:** If false, untrusted trust certificates (e.g. self signed), will not lead to an
+error. Do not disable this in production environment on a network you do not entirely trust. Especially public internet.
+
+**Keystore File:** A path to a file which contains keystore.
+
+**Keystore Type:** Format of a keystore.
+
+**Keystore Password:** Password for a keystore. If a keystore is not password protected leave it empty.
+
+**Keystore Key Algorithm:** An algorithm used for keystore.
+
+**Keystore Cert Alias**
+
+ Alias of the key in the keystore to be used for communication. This options is supported only by X.509 keys or keystores.
+ 
+Below is an example how the store need to be prepared:
+ ```
+ cat  client.crt client.key > client-bundle.pem
+
+ openssl pkcs12 -export -in client-bundle.pem -out full-chain.keycert.p12 -name ${CERT_ALIAS}
+
+ keytool -importkeystore -srckeystore full-chain.keycert.p12 -srcstoretype pkcs12 -srcalias ${CERT_ALIAS} \
+                         -destkeystore identity.jks -deststoretype jks -destalias ${CERT_ALIAS}
+ ```
+
+**TrustStore File:** A path to a file which contains truststore.
+
+**TrustStore Type:** Format of a truststore.
+
+**TrustStore Password:** Password for a truststore. If a truststore is not password protected leave it empty.
+
+**TrustStore Key Algorithm:** An algorithm used for truststore.
+
+**Transport Protocols:** Transport protocols which are allowed for connection.
+
+**Cipher Suites:** Cipher suites which are allowed for connection.
+Colons, commas or spaces are also acceptable separators.
+
diff --git a/icons/HTTP-action.png b/icons/HTTP-action.png
new file mode 100644
index 0000000000000000000000000000000000000000..933bf62be860484ae760288bfc532777bae46dd1
GIT binary patch
literal 2321
zcmZ`)dpOf=AHVmrX@?e3(o|HMbh2KgFeDzSHcRDfTX`R}o~Y2g#C}tFgr-NmF=0~E
zDqHH2a+sBp4vHup96GY*ti*=x{dxa??!)JMU*GGx@B8{**Z1@JWH9JnL_7%(03dpA
z_wWS(g&a`;tB-_`V^_nGpnqVemj}?zPElQ1E|S3=*&Y}J0Ks^6qk!<DDFE19Z;!2e
z<KGW<1^@MR(_D|;6~F2u)D2&}VzWYRc5gT8(<XGTFmAHEEcF%WIUS>G?w$NQu|zai
zT8sv!p~W~rsp;N>rqsDuI-4?CMx<RbuMC2?Lx#q*^@pxV86BsL<}K6Yv$G76Xsa93
zwPeFD+lr0TMoW5d4<=hCPO(oYc@V`lUeUYQyq4XTWl(f8uvbuSTldGg(bxY?+tf6z
z^4?Prb|UU_1#M%!ru9Qw9&1n;WlLf-x8En*6$VK%h>>=2zGj&nY|iE1Or#RW0#@C+
z09$*9`s%<NWKLA__-#gWTj#VY@~lvNPyO09D?L2J`aqd1oZD*WqI{(Xt5ada$oKK*
zA7q<#w9eFJaa9Gc_CT;YpM`DDjVCbniSFmDzj`C4a}buD(^k!+>*_eH-Cri(TiJhF
zd`EX%S?$i21$j-l^*KDH)Eh>cL%5gVz1Zf`Rb|Fl1hkar<%sXFj8{!vx}`muwEJC7
zgp&F4bN|ZHd6Jp`Sg$>?AinR?mt<!7(M-kA$W#mZhttdtjpZogZk^8>GF*=NJ$XF%
zq1h_Ptb%XBiYknP4JUck&S><A*|dG2sKRv^3wr0cQyrZ^o;miHBm%gFh0_6@XVH26
zHc|#3Gp#ZKk<YVmith&NKEJz;RLoCxSF8sud26jend{9wE)BUO6@rUeMT)j=1@caS
z9l8?&+3Mra5se;U>Ma`B^%mgRl~u~3%p1m2Z#KQK%`gT(w!Q3pScdx8ZQk^GrH_~f
z==%ofdj&ir<oB&t$oaK{&6jbCXWln!OHL=w9PTCp-j+p8L+UDLRSejYdh&fI-5snZ
zRr_{N4WkvOCteNdS}W3-%$RZX$Ddx@9n=vH*zB!$8e^Yu@`7{l7S!qmjDgfb9)Zo_
zGpjAYiL?57K2H`2Ps|hDabsNfEyBPXNdW~v3P2t|R^Pq0qJKU71e36a0{o~mwDp|u
zE`$dEFxW<}EZ5lNQ62M9VEo`aQf!BVXRt;a)G*1Y4K$Oi`@D;2^pm=%R{KKZm)N)Y
z%rFa|;1|t~Io@g+XWmEd&`w5_YlB8?2l@uYxs2|RvU-TUAevd)+RGi#o*v)~XD!uI
zngS<vf=pc~C-(}gehdUVii{z}_u_2LfMj@bF?d~tx}LF_teaZ8EB<k8T&n!=lso}a
znl4#8B%l{CbrE2)=HIfdR+^}i;q%6dE$W^!7Vmgi8&@iS3{BNcYXk@8^UrDfkC{=5
zFkpV)Cgod?^u3PC#CPN7*P})GTm4$I<@p`vGJW_1e6PBN8yb2?C=K5Q`Yz}~`L`xm
zp*{WqTi6lbow|u|sE_2F%%zM}TXQgYsRh?nZ?i)UJ*c6LYmgLOqYdMyO2>ThEe@}h
zU)sQ1HFFLB=%;R%q%Q_P?B7hh2!>VuzWbx7#y+~jc{i;!F7g@FBD3W1<y<qLmxM}_
zzdI&g1Z?f8A;Z_&>iZkkXp-w+o~ol6{5s!_wG)QKcqUP&pUq3zi9Zst;tXux*(Lhf
z+{RtfL6;rXNPp2472hizKZn($G%ivt|4)a9j4(~I5vW<bJc$@eyCilPihI<NV%rxo
zsQj?K=kY1xzp7@+hR(`a`flmuW6&#6cDO*4&2iLR8*O&wesd*mGEwI@z4Gq~F$Dh6
zd81=OCT)ykWDJ~6=e3VG2?cU~;tnjZqDkeP+xO&x^NVB^1DKxg!BkXMc5<V%v9!5S
z<KoA3es4<5{TVv5{NutEmJX3m<-1S?9N)!&uK&@==EPu$SL^3JE?E`s*wzd3f9OLb
z%|29Am!_;$C-_&Ws!I%_LMOUxFjRqkU|iSp=q}x}4Kj=_!`LigjUBiscKg!-Y5Uv-
z0R^Kp@X>tN22SNt8CsEL?Z$`IMe(YxLMu>Z)3WnEij4=S>t-26%OoI-%0(EJL=Xii
z>5@6!ICx<h$R#-bYI$~u9*>R0yZJv&?CAq0>qzb5H6T2D8$Lbixe8&f&<^E+g*scD
zHqPm`LMa$z6Z<D$4@ZlsdJK>Mlb-~{z#>!NoIe>1|7GKO>V|PbuU})78AKYZ5G2h*
zlxSht8EX*G-arPTjs8?61p^40iKkYD?jWFP`tc`3teRif_uC<9^&3QZ8m+#<jYZ=#
z$s&nb(16I6FuzA-ivgdQg)^1R<p4d^KC5L;%z^!Q;7(2GC`dX543#gPSc9w3FeN%c
z9}%yi3yDGqwqW_yc1^r6G)47~>3@5k?5)fmOP1WlD1UX{Z!b+g+iP==efMUBf|Ro-
zv%HzNBxxBW586)dD)#vCICJ;m=S~xU;IEe5($ApYi`#}rQF!xlRiH*kh7Ps7n4V9-
zZh)=XvSnAV#l;$2wm<Oti8KDq3bbmRu5v(Gp!15=!>dL+;C)bGdW7Cm#8E;%S{1vU
z4`1RSEuC6$q)cv2T?I_Ad|v-b^qWn*9p;bDYP}U3%=fC|`&&IfD37qdef@qQXG1QW
z5F`>GBtf&DR(243wK$b?NxWPXWpX`Vm<A^V-fZ+;X@Bbo@r{Je2^%GqA1rTwsBah2
zAe5Y>MJm!NOKX}V8^z<LRYV*=ZPr?GDQV-ECCxZ~c;%H6B0eQNPJAI7sjt2n4~?YI
z2+#=JOh6%4jfIqn?g(&G5QuqzKs1Ddl!x3Ah)6k{MQLexc+#S!#^YfzR&QnpW69&?
zbAPTrI!f3tvcYB7&&O(VMmC=*Wtl3eo(kjRI82h5ayO@)-QoiQ)N?#`=GI~!IF?<S
vmKmfaAyhDm^$b9k_iv6q#}57;6}vz7V00ANcq(9Ec$Pojo^%hXJ3Hlnt%@*F

literal 0
HcmV?d00001

diff --git a/pom.xml b/pom.xml
index 80bf3875..87d37be0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <name>HTTP Plugins</name>
   <groupId>io.cdap</groupId>
   <artifactId>http-plugins</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.2-SNAPSHOT</version>
 
   <licenses>
     <license>
diff --git a/src/main/java/io/cdap/plugin/http/action/HttpAction.java b/src/main/java/io/cdap/plugin/http/action/HttpAction.java
new file mode 100644
index 00000000..a2a2a76b
--- /dev/null
+++ b/src/main/java/io/cdap/plugin/http/action/HttpAction.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2021 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.action;
+
+import io.cdap.cdap.api.annotation.Description;
+import io.cdap.cdap.api.annotation.Name;
+import io.cdap.cdap.api.annotation.Plugin;
+import io.cdap.cdap.etl.api.PipelineConfigurer;
+import io.cdap.cdap.etl.api.action.Action;
+import io.cdap.cdap.etl.api.action.ActionContext;
+import io.cdap.plugin.http.common.RetryPolicy;
+import io.cdap.plugin.http.common.error.HttpErrorHandler;
+import io.cdap.plugin.http.common.error.RetryableErrorHandling;
+import io.cdap.plugin.http.common.http.HttpClient;
+import io.cdap.plugin.http.common.http.HttpConstants;
+import io.cdap.plugin.http.common.http.HttpResponse;
+import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionTimeoutException;
+import org.awaitility.pollinterval.FixedPollInterval;
+import org.awaitility.pollinterval.IterativePollInterval;
+import org.awaitility.pollinterval.PollInterval;
+
+import java.io.IOException;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * HTTP Action Plugin
+ */
+@Plugin(type = Action.PLUGIN_TYPE)
+@Name(HttpConstants.HTTP_PLUGIN_NAME)
+@Description("Action that runs a MySQL command")
+public class HttpAction extends Action {
+
+  private final HttpActionConfig config;
+
+  public HttpAction(HttpActionConfig config) {
+    this.config = config;
+  }
+
+    private boolean makeRequest(HttpClient httpClient, String uri, HttpErrorHandler errorHandler) throws IOException {
+    HttpResponse response = new HttpResponse(httpClient.executeHTTP(uri));
+    RetryableErrorHandling errorHandlingStrategy = errorHandler.getErrorHandlingStrategy(response.getStatusCode());
+
+    response.close();
+    return !errorHandlingStrategy.shouldRetry();
+  }
+
+  @Override
+  public void run(ActionContext actionContext) throws Exception {
+    try (HttpClient httpClient = new HttpClient(config)) {
+      HttpErrorHandler httpErrorHandler = new HttpErrorHandler(config);
+      PollInterval pollInterval = (config.getRetryPolicy().equals(RetryPolicy.LINEAR))
+        ? FixedPollInterval.fixed(Objects.requireNonNull(config.getLinearRetryInterval()), TimeUnit.SECONDS)
+        : IterativePollInterval.iterative(duration -> duration.multiply(2));
+
+      Awaitility
+        .await().with()
+        .pollInterval(pollInterval)
+        .timeout(config.getMaxRetryDuration(), TimeUnit.SECONDS)
+        .until(() -> makeRequest(httpClient, config.getUrl(), httpErrorHandler));
+    } catch (ConditionTimeoutException ignored) {
+    }
+  }
+
+  @Override
+  public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
+    super.configurePipeline(pipelineConfigurer);
+    config.validate();
+  }
+}
diff --git a/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java b/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java
new file mode 100644
index 00000000..14cc6fca
--- /dev/null
+++ b/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java
@@ -0,0 +1,475 @@
+/*
+ * Copyright © 2021 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.action;
+
+import io.cdap.cdap.api.annotation.Description;
+import io.cdap.cdap.api.annotation.Macro;
+import io.cdap.cdap.api.annotation.Name;
+import io.cdap.cdap.api.plugin.PluginConfig;
+import io.cdap.cdap.etl.api.validation.InvalidConfigPropertyException;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.RetryPolicy;
+import io.cdap.plugin.http.common.error.ErrorHandling;
+import io.cdap.plugin.http.common.error.HttpErrorHandlerEntity;
+import io.cdap.plugin.http.common.http.HttpConstants;
+import io.cdap.plugin.http.common.http.IHttpConfig;
+import io.cdap.plugin.http.common.http.KeyStoreType;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+/**
+ * Http Action plugin Config
+ */
+public class HttpActionConfig extends PluginConfig implements IHttpConfig {
+
+  @Name(HttpConstants.PROPERTY_URL)
+  @Description("Url to fetch to the first page. The url must start with a protocol (e.g. http://).")
+  @Macro
+  protected String url;
+
+  @Name(HttpConstants.PROPERTY_HTTP_METHOD)
+  @Description("HTTP request method.")
+  @Macro
+  protected String httpMethod;
+
+  @Name(HttpConstants.PROPERTY_HEADERS)
+  @Nullable
+  @Description("Headers to send with each HTTP request.")
+  @Macro
+  protected String headers;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_REQUEST_BODY)
+  @Description("Body to send with each HTTP request.")
+  @Macro
+  protected String requestBody;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_USERNAME)
+  @Description("Username for basic authentication.")
+  @Macro
+  protected String username;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_PASSWORD)
+  @Description("Password for basic authentication.")
+  @Macro
+  protected String password;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_PROXY_URL)
+  @Description("Proxy URL. Must contain a protocol, address and port.")
+  @Macro
+  protected String proxyUrl;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_PROXY_USERNAME)
+  @Description("Proxy username.")
+  @Macro
+  protected String proxyUsername;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_PROXY_PASSWORD)
+  @Description("Proxy password.")
+  @Macro
+  protected String proxyPassword;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_HTTP_ERROR_HANDLING)
+  @Description("Defines the error handling strategy to use for certain HTTP response codes." +
+    "The left column contains a regular expression for HTTP status code. The right column contains an action which" +
+    "is done in case of match. If HTTP status code matches multiple regular expressions, " +
+    "the first specified in mapping is matched.")
+  protected String httpErrorsHandling;
+
+  @Name(HttpConstants.PROPERTY_ERROR_HANDLING)
+  @Description("Error handling strategy to use when the HTTP response cannot be transformed to an output record.")
+  protected String errorHandling;
+
+
+  @Name(HttpConstants.PROPERTY_CONNECT_TIMEOUT)
+  @Description("Maximum time in seconds connection initialization is allowed to take.")
+  @Macro
+  protected Integer connectTimeout;
+
+  @Name(HttpConstants.PROPERTY_READ_TIMEOUT)
+  @Description("Maximum time in seconds fetching data from the server is allowed to take.")
+  @Macro
+  protected Integer readTimeout;
+
+  @Name(HttpConstants.PROPERTY_OAUTH2_ENABLED)
+  @Description("If true, plugin will perform OAuth2 authentication.")
+  protected String oauth2Enabled;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_AUTH_URL)
+  @Description("Endpoint for the authorization server used to retrieve the authorization code.")
+  @Macro
+  protected String authUrl;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_TOKEN_URL)
+  @Description("Endpoint for the resource server, which exchanges the authorization code for an access token.")
+  @Macro
+  protected String tokenUrl;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_CLIENT_ID)
+  @Description("Client identifier obtained during the Application registration process.")
+  @Macro
+  protected String clientId;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_CLIENT_SECRET)
+  @Description("Client secret obtained during the Application registration process.")
+  @Macro
+  protected String clientSecret;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_SCOPES)
+  @Description("Scope of the access request, which might have multiple space-separated values.")
+  @Macro
+  protected String scopes;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_REFRESH_TOKEN)
+  @Description("Token used to receive accessToken, which is end product of OAuth2.")
+  @Macro
+  protected String refreshToken;
+
+  @Name(HttpConstants.PROPERTY_VERIFY_HTTPS)
+  @Description("If false, untrusted trust certificates (e.g. self signed), will not lead to an" +
+    "error. Do not disable this in production environment on a network you do not entirely trust. " +
+    "Especially public internet.")
+  @Macro
+  protected String verifyHttps;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_KEYSTORE_FILE)
+  @Description("A path to a file which contains keystore.")
+  @Macro
+  protected String keystoreFile;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_KEYSTORE_TYPE)
+  @Description("Format of a keystore.")
+  @Macro
+  protected String keystoreType;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_KEYSTORE_PASSWORD)
+  @Description("Password for a keystore. If a keystore is not password protected leave it empty.")
+  @Macro
+  protected String keystorePassword;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_KEYSTORE_KEY_ALGORITHM)
+  @Description("An algorithm used for keystore.")
+  @Macro
+  protected String keystoreKeyAlgorithm;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_TRUSTSTORE_FILE)
+  @Description("A path to a file which contains truststore.")
+  @Macro
+  protected String trustStoreFile;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_TRUSTSTORE_TYPE)
+  @Description("Format of a truststore.")
+  @Macro
+  protected String trustStoreType;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_TRUSTSTORE_PASSWORD)
+  @Description("Password for a truststore. If a truststore is not password protected leave it empty.")
+  @Macro
+  protected String trustStorePassword;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_TRUSTSTORE_KEY_ALGORITHM)
+  @Description("An algorithm used for truststore.")
+  @Macro
+  protected String trustStoreKeyAlgorithm;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_TRANSPORT_PROTOCOLS)
+  @Description("Transport protocols which are allowed for connection.")
+  @Macro
+  protected String transportProtocols;
+
+  @Nullable
+  @Name(HttpConstants.PROPERTY_CIPHER_SUITES)
+  @Description("Cipher suites which are allowed for connection. " +
+    "Colons, commas or spaces are also acceptable separators.")
+  @Macro
+  protected String cipherSuites;
+
+  @Name(HttpConstants.PROPERTY_KEYSTORE_CERT_ALIAS)
+  @Macro
+  @Nullable
+  @Description("Alias of the key in the keystore to be used for communication")
+  protected String keystoreCertAliasName;
+
+  @Override
+  public String getUrl() {
+    return url;
+  }
+
+  @Override
+  public String getHttpMethod() {
+    return httpMethod;
+  }
+
+  @Override
+  @Nullable
+  public String getHeaders() {
+    return headers;
+  }
+
+  @Override
+  @Nullable
+  public String getRequestBody() {
+    return requestBody;
+  }
+
+  @Override
+  @Nullable
+  public String getUsername() {
+    return username;
+  }
+
+  @Override
+  @Nullable
+  public String getPassword() {
+    return password;
+  }
+
+  @Override
+  @Nullable
+  public String getProxyUrl() {
+    return proxyUrl;
+  }
+
+  @Override
+  @Nullable
+  public String getProxyUsername() {
+    return proxyUsername;
+  }
+
+  @Override
+  @Nullable
+  public String getProxyPassword() {
+    return proxyPassword;
+  }
+
+  @Override
+  public ErrorHandling getErrorHandling() {
+    return BaseHttpSourceConfig.getEnumValueByString(
+      ErrorHandling.class,
+      errorHandling,
+      HttpConstants.PROPERTY_ERROR_HANDLING
+    );
+  }
+
+  @Override
+  public List<HttpErrorHandlerEntity> getHttpErrorHandlingEntries() {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public Long getLinearRetryInterval() {
+    return 0L;
+  }
+
+  @Override
+  public Long getMaxRetryDuration() {
+    return 1L;
+  }
+
+  @Override
+  public RetryPolicy getRetryPolicy() {
+    return RetryPolicy.LINEAR;
+  }
+
+  @Override
+  public Integer getConnectTimeout() {
+    return connectTimeout;
+  }
+
+  @Override
+  public Integer getReadTimeout() {
+    return 30;
+  }
+
+  @Override
+  public Boolean getOauth2Enabled() {
+    return Boolean.parseBoolean(oauth2Enabled);
+  }
+
+  @Override
+  @Nullable
+  public String getAuthUrl() {
+    return authUrl;
+  }
+
+  @Override
+  @Nullable
+  public String getTokenUrl() {
+    return tokenUrl;
+  }
+
+  @Override
+  @Nullable
+  public String getClientId() {
+    return clientId;
+  }
+
+  @Override
+  @Nullable
+  public String getClientSecret() {
+    return clientSecret;
+  }
+
+  @Override
+  @Nullable
+  public String getRefreshToken() {
+    return refreshToken;
+  }
+
+  @Override
+  public Boolean getVerifyHttps() {
+    return Boolean.parseBoolean(verifyHttps);
+  }
+
+  @Override
+  @Nullable
+  public String getKeystoreFile() {
+    return keystoreFile;
+  }
+
+  @Override
+  @Nullable
+  public KeyStoreType getKeystoreType() {
+    return BaseHttpSourceConfig.getEnumValueByString(
+      KeyStoreType.class,
+      keystoreType,
+      HttpConstants.PROPERTY_KEYSTORE_TYPE
+    );
+  }
+
+  @Override
+  @Nullable
+  public String getKeystorePassword() {
+    return keystorePassword;
+  }
+
+  @Override
+  @Nullable
+  public String getKeystoreKeyAlgorithm() {
+    return keystoreKeyAlgorithm;
+  }
+
+  @Override
+  @Nullable
+  public String getTrustStoreFile() {
+    return trustStoreFile;
+  }
+
+  @Override
+  @Nullable
+  public KeyStoreType getTrustStoreType() {
+    return BaseHttpSourceConfig.getEnumValueByString(
+      KeyStoreType.class,
+      trustStoreType,
+      HttpConstants.PROPERTY_TRUSTSTORE_TYPE
+    );
+  }
+
+  @Override
+  @Nullable
+  public String getTrustStorePassword() {
+    return trustStorePassword;
+  }
+
+  @Override
+  @Nullable
+  public String getTrustStoreKeyAlgorithm() {
+    return trustStoreKeyAlgorithm;
+  }
+
+  @Override
+  @Nullable
+  public String getCipherSuites() {
+    return cipherSuites;
+  }
+
+  @Override
+  @Nullable
+  public String getKeystoreCertAliasName() {
+    return keystoreCertAliasName;
+  }
+
+  @Override
+  @Nullable
+  public Map<String, String> getHeadersMap() {
+    return BaseHttpSourceConfig.getMapFromKeyValueString(headers);
+  }
+
+  @Override
+  public List<String> getTransportProtocolsList() {
+    return BaseHttpSourceConfig.getListFromString(transportProtocols);
+  }
+
+  @Override
+  public void validate() {
+    // Validate URL
+    if (!containsMacro(HttpConstants.PROPERTY_URL)) {
+      try {
+        // replace with placeholder with anything just during pagination
+        new URI(getUrl());
+      } catch (URISyntaxException e) {
+        throw new InvalidConfigPropertyException(
+          String.format("URL value is not valid: '%s'", getUrl()), e, HttpConstants.PROPERTY_URL);
+      }
+    }
+
+    // Validate OAuth2 properties
+    if (!containsMacro(HttpConstants.PROPERTY_OAUTH2_ENABLED) && this.getOauth2Enabled()) {
+      String reasonOauth2 = "OAuth2 is enabled";
+      BaseHttpSourceConfig.assertIsSet(getAuthUrl(), HttpConstants.PROPERTY_AUTH_URL, reasonOauth2);
+      BaseHttpSourceConfig.assertIsSet(getTokenUrl(), HttpConstants.PROPERTY_TOKEN_URL, reasonOauth2);
+      BaseHttpSourceConfig.assertIsSet(getClientId(), HttpConstants.PROPERTY_CLIENT_ID, reasonOauth2);
+      BaseHttpSourceConfig.assertIsSet(getClientSecret(), HttpConstants.PROPERTY_CLIENT_SECRET, reasonOauth2);
+      BaseHttpSourceConfig.assertIsSet(getRefreshToken(), HttpConstants.PROPERTY_REFRESH_TOKEN, reasonOauth2);
+    }
+
+    if (!containsMacro(HttpConstants.PROPERTY_VERIFY_HTTPS) && !getVerifyHttps()) {
+      BaseHttpSourceConfig.assertIsNotSet(
+        getTrustStoreFile(),
+        HttpConstants.PROPERTY_TRUSTSTORE_FILE,
+        String.format("trustore settings are ignored due to disabled %s", HttpConstants.PROPERTY_VERIFY_HTTPS)
+      );
+    }
+  }
+
+}
diff --git a/src/main/java/io/cdap/plugin/http/source/common/BaseHttpSourceConfig.java b/src/main/java/io/cdap/plugin/http/common/BaseHttpSourceConfig.java
similarity index 97%
rename from src/main/java/io/cdap/plugin/http/source/common/BaseHttpSourceConfig.java
rename to src/main/java/io/cdap/plugin/http/common/BaseHttpSourceConfig.java
index 9c21627a..cfb68a82 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/BaseHttpSourceConfig.java
+++ b/src/main/java/io/cdap/plugin/http/common/BaseHttpSourceConfig.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common;
+package io.cdap.plugin.http.common;
 
 import com.google.common.base.Strings;
 import io.cdap.cdap.api.annotation.Description;
@@ -23,13 +23,14 @@
 import io.cdap.cdap.etl.api.validation.InvalidConfigPropertyException;
 import io.cdap.cdap.etl.api.validation.InvalidStageException;
 import io.cdap.plugin.common.ReferencePluginConfig;
-import io.cdap.plugin.http.source.common.error.ErrorHandling;
-import io.cdap.plugin.http.source.common.error.HttpErrorHandlerEntity;
-import io.cdap.plugin.http.source.common.error.RetryableErrorHandling;
-import io.cdap.plugin.http.source.common.http.KeyStoreType;
-import io.cdap.plugin.http.source.common.pagination.PaginationIteratorFactory;
-import io.cdap.plugin.http.source.common.pagination.PaginationType;
-import io.cdap.plugin.http.source.common.pagination.page.PageFormat;
+import io.cdap.plugin.http.common.error.ErrorHandling;
+import io.cdap.plugin.http.common.error.HttpErrorHandlerEntity;
+import io.cdap.plugin.http.common.error.RetryableErrorHandling;
+import io.cdap.plugin.http.common.http.IHttpConfig;
+import io.cdap.plugin.http.common.http.KeyStoreType;
+import io.cdap.plugin.http.common.pagination.PaginationIteratorFactory;
+import io.cdap.plugin.http.common.pagination.PaginationType;
+import io.cdap.plugin.http.common.pagination.page.PageFormat;
 
 import java.io.IOException;
 import java.net.URI;
@@ -49,8 +50,7 @@
 /**
  * Base configuration for HTTP Streaming and Batch plugins.
  */
-public abstract class BaseHttpSourceConfig extends ReferencePluginConfig {
-  public static final String PROPERTY_REFERENCE_NAME = "referenceName";
+public abstract class BaseHttpSourceConfig extends ReferencePluginConfig implements IHttpConfig {
   public static final String PROPERTY_URL = "url";
   public static final String PROPERTY_HTTP_METHOD = "httpMethod";
   public static final String PROPERTY_HEADERS = "headers";
diff --git a/src/main/java/io/cdap/plugin/http/source/common/EnumWithValue.java b/src/main/java/io/cdap/plugin/http/common/EnumWithValue.java
similarity index 94%
rename from src/main/java/io/cdap/plugin/http/source/common/EnumWithValue.java
rename to src/main/java/io/cdap/plugin/http/common/EnumWithValue.java
index 653a12d4..562caaf7 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/EnumWithValue.java
+++ b/src/main/java/io/cdap/plugin/http/common/EnumWithValue.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common;
+package io.cdap.plugin.http.common;
 
 /**
  * Enum which has string values as a part of it.
diff --git a/src/main/java/io/cdap/plugin/http/source/common/RetryPolicy.java b/src/main/java/io/cdap/plugin/http/common/RetryPolicy.java
similarity index 95%
rename from src/main/java/io/cdap/plugin/http/source/common/RetryPolicy.java
rename to src/main/java/io/cdap/plugin/http/common/RetryPolicy.java
index 2d0157d9..c2cb8cb2 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/RetryPolicy.java
+++ b/src/main/java/io/cdap/plugin/http/common/RetryPolicy.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common;
+package io.cdap.plugin.http.common;
 
 /**
  * An enum which represents a retry policy.
diff --git a/src/main/java/io/cdap/plugin/http/source/common/error/ErrorHandling.java b/src/main/java/io/cdap/plugin/http/common/error/ErrorHandling.java
similarity index 91%
rename from src/main/java/io/cdap/plugin/http/source/common/error/ErrorHandling.java
rename to src/main/java/io/cdap/plugin/http/common/error/ErrorHandling.java
index 47f06b55..7bea8055 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/error/ErrorHandling.java
+++ b/src/main/java/io/cdap/plugin/http/common/error/ErrorHandling.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.error;
+package io.cdap.plugin.http.common.error;
 
-import io.cdap.plugin.http.source.common.EnumWithValue;
+import io.cdap.plugin.http.common.EnumWithValue;
 
 /**
  * Indicates error handling strategy which will be used during reading HTTP records.
diff --git a/src/main/java/io/cdap/plugin/http/source/common/error/HttpErrorHandler.java b/src/main/java/io/cdap/plugin/http/common/error/HttpErrorHandler.java
similarity index 89%
rename from src/main/java/io/cdap/plugin/http/source/common/error/HttpErrorHandler.java
rename to src/main/java/io/cdap/plugin/http/common/error/HttpErrorHandler.java
index c6a802f3..3c37f175 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/error/HttpErrorHandler.java
+++ b/src/main/java/io/cdap/plugin/http/common/error/HttpErrorHandler.java
@@ -13,9 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.error;
+package io.cdap.plugin.http.common.error;
+
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.IHttpConfig;
 
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +32,7 @@ public class HttpErrorHandler {
 
   private List<HttpErrorHandlerEntity> httpErrorsHandlingEntries;
 
-  public HttpErrorHandler(BaseHttpSourceConfig config) {
+  public HttpErrorHandler(IHttpConfig config) {
     this.httpErrorsHandlingEntries = config.getHttpErrorHandlingEntries();
   }
 
diff --git a/src/main/java/io/cdap/plugin/http/source/common/error/HttpErrorHandlerEntity.java b/src/main/java/io/cdap/plugin/http/common/error/HttpErrorHandlerEntity.java
similarity index 96%
rename from src/main/java/io/cdap/plugin/http/source/common/error/HttpErrorHandlerEntity.java
rename to src/main/java/io/cdap/plugin/http/common/error/HttpErrorHandlerEntity.java
index 09a803a1..8e4e4177 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/error/HttpErrorHandlerEntity.java
+++ b/src/main/java/io/cdap/plugin/http/common/error/HttpErrorHandlerEntity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.error;
+package io.cdap.plugin.http.common.error;
 
 import java.util.Objects;
 import java.util.regex.Pattern;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/error/RetryableErrorHandling.java b/src/main/java/io/cdap/plugin/http/common/error/RetryableErrorHandling.java
similarity index 94%
rename from src/main/java/io/cdap/plugin/http/source/common/error/RetryableErrorHandling.java
rename to src/main/java/io/cdap/plugin/http/common/error/RetryableErrorHandling.java
index 0efa839e..e910ca34 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/error/RetryableErrorHandling.java
+++ b/src/main/java/io/cdap/plugin/http/common/error/RetryableErrorHandling.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.error;
+package io.cdap.plugin.http.common.error;
 
-import io.cdap.plugin.http.source.common.EnumWithValue;
+import io.cdap.plugin.http.common.EnumWithValue;
 
 /**
  * Indicates error handling strategy which will be used to handle unexpected http status codes.
diff --git a/src/main/java/io/cdap/plugin/http/source/common/http/HttpClient.java b/src/main/java/io/cdap/plugin/http/common/http/HttpClient.java
similarity index 96%
rename from src/main/java/io/cdap/plugin/http/source/common/http/HttpClient.java
rename to src/main/java/io/cdap/plugin/http/common/http/HttpClient.java
index bb41293c..92597764 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/http/HttpClient.java
+++ b/src/main/java/io/cdap/plugin/http/common/http/HttpClient.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.http;
+package io.cdap.plugin.http.common.http;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Strings;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
@@ -45,11 +45,11 @@
  */
 public class HttpClient implements Closeable {
   private final Map<String, String> headers;
-  private final BaseHttpSourceConfig config;
+  private final IHttpConfig config;
   private final StringEntity requestBody;
   private CloseableHttpClient httpClient;
 
-  public HttpClient(BaseHttpSourceConfig config) {
+  public HttpClient(IHttpConfig config) {
     this.config = config;
     this.headers = config.getHeadersMap();
 
diff --git a/src/main/java/io/cdap/plugin/http/common/http/HttpConstants.java b/src/main/java/io/cdap/plugin/http/common/http/HttpConstants.java
new file mode 100644
index 00000000..0e10acb5
--- /dev/null
+++ b/src/main/java/io/cdap/plugin/http/common/http/HttpConstants.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2017 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.common.http;
+
+/**
+ * HTTP Plugin Constants
+ */
+public final class HttpConstants {
+  private HttpConstants() {
+
+  }
+
+  public static final String HTTP_PLUGIN_NAME = "HTTP";
+
+  // Field Name Constants
+  public static final String PROPERTY_URL = "url";
+  public static final String PROPERTY_HTTP_METHOD = "httpMethod";
+  public static final String PROPERTY_HEADERS = "headers";
+  public static final String PROPERTY_REQUEST_BODY = "requestBody";
+  public static final String PROPERTY_USERNAME = "username";
+  public static final String PROPERTY_PASSWORD = "password";
+  public static final String PROPERTY_PROXY_URL = "proxyUrl";
+  public static final String PROPERTY_PROXY_USERNAME = "proxyUsername";
+  public static final String PROPERTY_PROXY_PASSWORD = "proxyPassword";
+  public static final String PROPERTY_HTTP_ERROR_HANDLING = "httpErrorsHandling";
+  public static final String PROPERTY_ERROR_HANDLING = "errorHandling";
+  public static final String PROPERTY_RETRY_POLICY = "retryPolicy";
+  public static final String PROPERTY_CONNECT_TIMEOUT = "connectTimeout";
+  public static final String PROPERTY_READ_TIMEOUT = "readTimeout";
+  public static final String PROPERTY_OAUTH2_ENABLED = "oauth2Enabled";
+  public static final String PROPERTY_AUTH_URL = "authUrl";
+  public static final String PROPERTY_TOKEN_URL = "tokenUrl";
+  public static final String PROPERTY_CLIENT_ID = "clientId";
+  public static final String PROPERTY_CLIENT_SECRET = "clientSecret";
+  public static final String PROPERTY_SCOPES = "scopes";
+  public static final String PROPERTY_REFRESH_TOKEN = "refreshToken";
+  public static final String PROPERTY_VERIFY_HTTPS = "verifyHttps";
+  public static final String PROPERTY_KEYSTORE_FILE = "keystoreFile";
+  public static final String PROPERTY_KEYSTORE_TYPE = "keystoreType";
+  public static final String PROPERTY_KEYSTORE_PASSWORD = "keystorePassword";
+  public static final String PROPERTY_KEYSTORE_KEY_ALGORITHM = "keystoreKeyAlgorithm";
+  public static final String PROPERTY_TRUSTSTORE_FILE = "trustStoreFile";
+  public static final String PROPERTY_TRUSTSTORE_TYPE = "trustStoreType";
+  public static final String PROPERTY_TRUSTSTORE_PASSWORD = "trustStorePassword";
+  public static final String PROPERTY_TRUSTSTORE_KEY_ALGORITHM = "trustStoreKeyAlgorithm";
+  public static final String PROPERTY_TRANSPORT_PROTOCOLS = "transportProtocols";
+  public static final String PROPERTY_CIPHER_SUITES = "cipherSuites";
+  public static final String PROPERTY_SCHEMA = "schema";
+  public static final String PROPERTY_KEYSTORE_CERT_ALIAS = "keystoreCertAlias";
+}
diff --git a/src/main/java/io/cdap/plugin/http/source/common/http/HttpResponse.java b/src/main/java/io/cdap/plugin/http/common/http/HttpResponse.java
similarity index 98%
rename from src/main/java/io/cdap/plugin/http/source/common/http/HttpResponse.java
rename to src/main/java/io/cdap/plugin/http/common/http/HttpResponse.java
index f8d5254b..21c2cc97 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/http/HttpResponse.java
+++ b/src/main/java/io/cdap/plugin/http/common/http/HttpResponse.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package io.cdap.plugin.http.source.common.http;
+package io.cdap.plugin.http.common.http;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
diff --git a/src/main/java/io/cdap/plugin/http/common/http/IHttpConfig.java b/src/main/java/io/cdap/plugin/http/common/http/IHttpConfig.java
new file mode 100644
index 00000000..50dfb021
--- /dev/null
+++ b/src/main/java/io/cdap/plugin/http/common/http/IHttpConfig.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright © 2019 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.common.http;
+
+import io.cdap.plugin.http.common.RetryPolicy;
+import io.cdap.plugin.http.common.error.ErrorHandling;
+import io.cdap.plugin.http.common.error.HttpErrorHandlerEntity;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+/**
+ * Interface for the HTTP Plugin Config
+ */
+public interface IHttpConfig {
+
+  String getUrl();
+
+  String getHttpMethod();
+
+  @Nullable
+  String getHeaders();
+
+  @Nullable
+  String getRequestBody();
+
+  @Nullable
+  String getUsername();
+
+  @Nullable
+  String getPassword();
+
+  @Nullable
+  String getProxyUrl();
+
+  @Nullable
+  String getProxyUsername();
+
+  @Nullable
+  String getProxyPassword();
+
+  ErrorHandling getErrorHandling();
+
+  List<HttpErrorHandlerEntity> getHttpErrorHandlingEntries();
+
+  Long getLinearRetryInterval();
+
+  Long getMaxRetryDuration();
+
+  RetryPolicy getRetryPolicy();
+
+  Integer getConnectTimeout();
+
+  Integer getReadTimeout();
+
+  Boolean getOauth2Enabled();
+
+  @Nullable
+  String getAuthUrl();
+
+  @Nullable
+  String getTokenUrl();
+
+  @Nullable
+  String getClientId();
+
+  @Nullable
+  String getClientSecret();
+
+  @Nullable
+  String getRefreshToken();
+
+  Boolean getVerifyHttps();
+
+  @Nullable
+  String getKeystoreFile();
+
+  @Nullable
+  KeyStoreType getKeystoreType();
+
+  @Nullable
+  String getKeystorePassword();
+
+  @Nullable
+  String getKeystoreKeyAlgorithm();
+
+  @Nullable
+  String getTrustStoreFile();
+
+  @Nullable
+  KeyStoreType getTrustStoreType();
+
+  @Nullable
+  String getTrustStorePassword();
+
+  @Nullable
+  String getTrustStoreKeyAlgorithm();
+
+  @Nullable
+  String getCipherSuites();
+
+  @Nullable
+  String getKeystoreCertAliasName();
+
+  @Nullable
+  Map<String, String> getHeadersMap();
+
+  List<String> getTransportProtocolsList();
+
+  void validate();
+}
diff --git a/src/main/java/io/cdap/plugin/http/source/common/http/KeyStoreType.java b/src/main/java/io/cdap/plugin/http/common/http/KeyStoreType.java
similarity index 91%
rename from src/main/java/io/cdap/plugin/http/source/common/http/KeyStoreType.java
rename to src/main/java/io/cdap/plugin/http/common/http/KeyStoreType.java
index 6acbf12f..5d607af7 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/http/KeyStoreType.java
+++ b/src/main/java/io/cdap/plugin/http/common/http/KeyStoreType.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.http;
+package io.cdap.plugin.http.common.http;
 
-import io.cdap.plugin.http.source.common.EnumWithValue;
+import io.cdap.plugin.http.common.EnumWithValue;
 
 /**
  * An enum which represent a type of keystore or truststore.
diff --git a/src/main/java/io/cdap/plugin/http/source/common/http/OAuthUtil.java b/src/main/java/io/cdap/plugin/http/common/http/OAuthUtil.java
similarity index 94%
rename from src/main/java/io/cdap/plugin/http/source/common/http/OAuthUtil.java
rename to src/main/java/io/cdap/plugin/http/common/http/OAuthUtil.java
index 27ac280a..1928683d 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/http/OAuthUtil.java
+++ b/src/main/java/io/cdap/plugin/http/common/http/OAuthUtil.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.http;
+package io.cdap.plugin.http.common.http;
 
 import com.google.gson.JsonElement;
-import io.cdap.plugin.http.source.common.pagination.page.JSONUtil;
+import io.cdap.plugin.http.common.pagination.page.JSONUtil;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.utils.URIBuilder;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/http/SSLConnectionSocketFactoryCreator.java b/src/main/java/io/cdap/plugin/http/common/http/SSLConnectionSocketFactoryCreator.java
similarity index 93%
rename from src/main/java/io/cdap/plugin/http/source/common/http/SSLConnectionSocketFactoryCreator.java
rename to src/main/java/io/cdap/plugin/http/common/http/SSLConnectionSocketFactoryCreator.java
index 3cae7de4..729c852e 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/http/SSLConnectionSocketFactoryCreator.java
+++ b/src/main/java/io/cdap/plugin/http/common/http/SSLConnectionSocketFactoryCreator.java
@@ -14,14 +14,10 @@
  * the License.
  */
 
-package io.cdap.plugin.http.source.common.http;
+package io.cdap.plugin.http.common.http;
 
 import com.google.common.base.Strings;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -42,11 +38,9 @@
  * Class which creates an SSLConnectionSocketFactory.
  */
 public class SSLConnectionSocketFactoryCreator {
-  private static final Logger LOG = LoggerFactory.getLogger(SSLConnectionSocketFactoryCreator.class);
-
-  private final BaseHttpSourceConfig config;
+  private final IHttpConfig config;
 
-  public SSLConnectionSocketFactoryCreator(BaseHttpSourceConfig config) {
+  public SSLConnectionSocketFactoryCreator(IHttpConfig config) {
     this.config = config;
   }
 
diff --git a/src/main/java/io/cdap/plugin/http/source/common/http/TrustAllTrustManager.java b/src/main/java/io/cdap/plugin/http/common/http/TrustAllTrustManager.java
similarity index 95%
rename from src/main/java/io/cdap/plugin/http/source/common/http/TrustAllTrustManager.java
rename to src/main/java/io/cdap/plugin/http/common/http/TrustAllTrustManager.java
index c90743e4..86f0b930 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/http/TrustAllTrustManager.java
+++ b/src/main/java/io/cdap/plugin/http/common/http/TrustAllTrustManager.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package io.cdap.plugin.http.source.common.http;
+package io.cdap.plugin.http.common.http;
 
 import java.security.cert.X509Certificate;
 import javax.net.ssl.X509TrustManager;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/http/X509KeyManagerAliasWrapper.java b/src/main/java/io/cdap/plugin/http/common/http/X509KeyManagerAliasWrapper.java
similarity index 98%
rename from src/main/java/io/cdap/plugin/http/source/common/http/X509KeyManagerAliasWrapper.java
rename to src/main/java/io/cdap/plugin/http/common/http/X509KeyManagerAliasWrapper.java
index 16dc553a..c1a2f8a3 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/http/X509KeyManagerAliasWrapper.java
+++ b/src/main/java/io/cdap/plugin/http/common/http/X509KeyManagerAliasWrapper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.http;
+package io.cdap.plugin.http.common.http;
 
 import java.net.Socket;
 import java.security.Principal;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/BaseHttpPaginationIterator.java b/src/main/java/io/cdap/plugin/http/common/pagination/BaseHttpPaginationIterator.java
similarity index 89%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/BaseHttpPaginationIterator.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/BaseHttpPaginationIterator.java
index ece34866..b05cd899 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/BaseHttpPaginationIterator.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/BaseHttpPaginationIterator.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination;
-
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.RetryPolicy;
-import io.cdap.plugin.http.source.common.error.ErrorHandling;
-import io.cdap.plugin.http.source.common.error.HttpErrorHandler;
-import io.cdap.plugin.http.source.common.error.RetryableErrorHandling;
-import io.cdap.plugin.http.source.common.http.HttpClient;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
-import io.cdap.plugin.http.source.common.pagination.page.PageFactory;
-import io.cdap.plugin.http.source.common.pagination.state.PaginationIteratorState;
-import io.cdap.plugin.http.source.common.pagination.state.UrlPaginationIteratorState;
+package io.cdap.plugin.http.common.pagination;
+
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.RetryPolicy;
+import io.cdap.plugin.http.common.error.ErrorHandling;
+import io.cdap.plugin.http.common.error.HttpErrorHandler;
+import io.cdap.plugin.http.common.error.RetryableErrorHandling;
+import io.cdap.plugin.http.common.http.HttpClient;
+import io.cdap.plugin.http.common.http.HttpResponse;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.page.PageFactory;
+import io.cdap.plugin.http.common.pagination.state.PaginationIteratorState;
+import io.cdap.plugin.http.common.pagination.state.UrlPaginationIteratorState;
 import org.awaitility.Awaitility;
 import org.awaitility.core.ConditionTimeoutException;
 import org.awaitility.pollinterval.FixedPollInterval;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/CustomPaginationIterator.java b/src/main/java/io/cdap/plugin/http/common/pagination/CustomPaginationIterator.java
similarity index 85%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/CustomPaginationIterator.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/CustomPaginationIterator.java
index ad1e8323..f7a9dea0 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/CustomPaginationIterator.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/CustomPaginationIterator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination;
+package io.cdap.plugin.http.common.pagination;
 
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
-import io.cdap.plugin.http.source.common.pagination.state.PaginationIteratorState;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.state.PaginationIteratorState;
 import org.apache.http.Header;
 
 import java.io.IOException;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/IncrementAnIndexPaginationIterator.java b/src/main/java/io/cdap/plugin/http/common/pagination/IncrementAnIndexPaginationIterator.java
similarity index 84%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/IncrementAnIndexPaginationIterator.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/IncrementAnIndexPaginationIterator.java
index 69084fad..4dd41f10 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/IncrementAnIndexPaginationIterator.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/IncrementAnIndexPaginationIterator.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination;
+package io.cdap.plugin.http.common.pagination;
 
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
-import io.cdap.plugin.http.source.common.pagination.state.IndexPaginationIteratorState;
-import io.cdap.plugin.http.source.common.pagination.state.PaginationIteratorState;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.state.IndexPaginationIteratorState;
+import io.cdap.plugin.http.common.pagination.state.PaginationIteratorState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/JythonPythonExecutor.java b/src/main/java/io/cdap/plugin/http/common/pagination/JythonPythonExecutor.java
similarity index 98%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/JythonPythonExecutor.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/JythonPythonExecutor.java
index 077ce114..7d0157de 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/JythonPythonExecutor.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/JythonPythonExecutor.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package io.cdap.plugin.http.source.common.pagination;
+package io.cdap.plugin.http.common.pagination;
 
 import com.google.common.base.Strings;
 import org.python.core.PyException;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/LinkInResponseBodyPaginationIterator.java b/src/main/java/io/cdap/plugin/http/common/pagination/LinkInResponseBodyPaginationIterator.java
similarity index 86%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/LinkInResponseBodyPaginationIterator.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/LinkInResponseBodyPaginationIterator.java
index cdc815d5..296cb9d0 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/LinkInResponseBodyPaginationIterator.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/LinkInResponseBodyPaginationIterator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination;
+package io.cdap.plugin.http.common.pagination;
 
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
-import io.cdap.plugin.http.source.common.pagination.state.PaginationIteratorState;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.state.PaginationIteratorState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/LinkInResponseHeaderPaginationIterator.java b/src/main/java/io/cdap/plugin/http/common/pagination/LinkInResponseHeaderPaginationIterator.java
similarity index 85%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/LinkInResponseHeaderPaginationIterator.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/LinkInResponseHeaderPaginationIterator.java
index 5e59b353..78e89856 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/LinkInResponseHeaderPaginationIterator.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/LinkInResponseHeaderPaginationIterator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination;
+package io.cdap.plugin.http.common.pagination;
 
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
-import io.cdap.plugin.http.source.common.pagination.state.PaginationIteratorState;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.state.PaginationIteratorState;
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.slf4j.Logger;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/NonePaginationIterator.java b/src/main/java/io/cdap/plugin/http/common/pagination/NonePaginationIterator.java
similarity index 78%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/NonePaginationIterator.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/NonePaginationIterator.java
index 80f48e3e..386048f2 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/NonePaginationIterator.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/NonePaginationIterator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination;
+package io.cdap.plugin.http.common.pagination;
 
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
-import io.cdap.plugin.http.source.common.pagination.state.PaginationIteratorState;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.state.PaginationIteratorState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/PaginationIteratorFactory.java b/src/main/java/io/cdap/plugin/http/common/pagination/PaginationIteratorFactory.java
similarity index 89%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/PaginationIteratorFactory.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/PaginationIteratorFactory.java
index c2cad0de..8eec5c75 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/PaginationIteratorFactory.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/PaginationIteratorFactory.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination;
+package io.cdap.plugin.http.common.pagination;
 
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.pagination.state.PaginationIteratorState;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.pagination.state.PaginationIteratorState;
 
 /**
  * A factory which creates instance of {@BaseHttpPaginationIterator} in accordance to pagination type configured in
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/PaginationType.java b/src/main/java/io/cdap/plugin/http/common/pagination/PaginationType.java
similarity index 91%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/PaginationType.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/PaginationType.java
index d567f585..984c4c81 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/PaginationType.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/PaginationType.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination;
+package io.cdap.plugin.http.common.pagination;
 
-import io.cdap.plugin.http.source.common.EnumWithValue;
+import io.cdap.plugin.http.common.EnumWithValue;
 
 /**
  * An enum which represent a type of pagination.
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/TokenPaginationIterator.java b/src/main/java/io/cdap/plugin/http/common/pagination/TokenPaginationIterator.java
similarity index 85%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/TokenPaginationIterator.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/TokenPaginationIterator.java
index d3f88041..57885534 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/TokenPaginationIterator.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/TokenPaginationIterator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination;
+package io.cdap.plugin.http.common.pagination;
 
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
-import io.cdap.plugin.http.source.common.pagination.state.PaginationIteratorState;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.state.PaginationIteratorState;
 import org.apache.http.client.utils.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/BasePage.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/BasePage.java
similarity index 90%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/BasePage.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/BasePage.java
index f6958e08..9d3ab6b9 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/BasePage.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/BasePage.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
-import io.cdap.plugin.http.source.common.http.HttpResponse;
+import io.cdap.plugin.http.common.http.HttpResponse;
 
 import java.io.Closeable;
 import java.util.Arrays;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/BlobPage.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/BlobPage.java
similarity index 91%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/BlobPage.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/BlobPage.java
index 59051964..17fef12e 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/BlobPage.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/BlobPage.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import io.cdap.cdap.api.data.format.StructuredRecord;
 import io.cdap.cdap.api.data.schema.Schema;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
 
 import java.io.IOException;
 
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/DelimitedPage.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/DelimitedPage.java
similarity index 90%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/DelimitedPage.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/DelimitedPage.java
index 393e6756..3c7ed25c 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/DelimitedPage.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/DelimitedPage.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import io.cdap.cdap.api.data.format.StructuredRecord;
 import io.cdap.cdap.format.StructuredRecordStringConverter;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
 
 import java.io.IOException;
 import java.util.NoSuchElementException;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/HttpErrorPage.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/HttpErrorPage.java
similarity index 88%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/HttpErrorPage.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/HttpErrorPage.java
index 657dee38..3590b3f0 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/HttpErrorPage.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/HttpErrorPage.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import io.cdap.cdap.api.data.format.StructuredRecord;
 import io.cdap.cdap.etl.api.InvalidEntry;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.error.ErrorHandling;
-import io.cdap.plugin.http.source.common.error.HttpErrorHandler;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.error.ErrorHandling;
+import io.cdap.plugin.http.common.error.HttpErrorHandler;
+import io.cdap.plugin.http.common.http.HttpResponse;
 
 /**
  * Represents a page with an error
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/InvalidEntryCreator.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/InvalidEntryCreator.java
similarity index 97%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/InvalidEntryCreator.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/InvalidEntryCreator.java
index f700aa42..8354ec21 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/InvalidEntryCreator.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/InvalidEntryCreator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import io.cdap.cdap.api.data.format.StructuredRecord;
 import io.cdap.cdap.api.data.schema.Schema;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/JSONUtil.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/JSONUtil.java
similarity index 99%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/JSONUtil.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/JSONUtil.java
index a0dc95e5..b48b8e02 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/JSONUtil.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/JSONUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.JsonArray;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/JsonPage.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/JsonPage.java
similarity index 97%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/JsonPage.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/JsonPage.java
index b89d5afe..b50fff73 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/JsonPage.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/JsonPage.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -21,8 +21,8 @@
 import io.cdap.cdap.api.data.schema.Schema;
 import io.cdap.cdap.etl.api.InvalidEntry;
 import io.cdap.cdap.format.StructuredRecordStringConverter;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/PageEntry.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/PageEntry.java
similarity index 92%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/PageEntry.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/PageEntry.java
index f686f986..bc01e371 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/PageEntry.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/PageEntry.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import io.cdap.cdap.api.data.format.StructuredRecord;
 import io.cdap.cdap.etl.api.InvalidEntry;
-import io.cdap.plugin.http.source.common.error.ErrorHandling;
+import io.cdap.plugin.http.common.error.ErrorHandling;
 
 /**
  * Represents a single entry found on page. The entry can either be an {@link InvalidEntry} or {@link StructuredRecord}.
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/PageFactory.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/PageFactory.java
similarity index 87%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/PageFactory.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/PageFactory.java
index 60b7e9c1..a1690a2b 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/PageFactory.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/PageFactory.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.error.HttpErrorHandler;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.error.HttpErrorHandler;
+import io.cdap.plugin.http.common.http.HttpResponse;
 
 import java.io.IOException;
 
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/PageFormat.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/PageFormat.java
similarity index 89%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/PageFormat.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/PageFormat.java
index 527cf3fb..c1f0296b 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/PageFormat.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/PageFormat.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
-import io.cdap.plugin.http.source.common.EnumWithValue;
+import io.cdap.plugin.http.common.EnumWithValue;
 
 /**
  * An enum which represent format of the page.
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/RecordPerLinePage.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/RecordPerLinePage.java
similarity index 93%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/RecordPerLinePage.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/RecordPerLinePage.java
index a3f18b69..50be7abe 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/RecordPerLinePage.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/RecordPerLinePage.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import io.cdap.cdap.api.data.format.StructuredRecord;
 import io.cdap.cdap.api.data.schema.Schema;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/TextPage.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/TextPage.java
similarity index 87%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/TextPage.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/TextPage.java
index b95564ab..d5d78395 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/TextPage.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/TextPage.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import io.cdap.cdap.api.data.format.StructuredRecord;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
 
 import java.io.IOException;
 
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/XmlPage.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/XmlPage.java
similarity index 95%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/XmlPage.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/XmlPage.java
index c50c9901..52cab5d3 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/XmlPage.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/XmlPage.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.google.gson.JsonArray;
@@ -25,8 +25,8 @@
 import io.cdap.cdap.api.data.format.StructuredRecord;
 import io.cdap.cdap.api.data.schema.Schema;
 import io.cdap.cdap.format.StructuredRecordStringConverter;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpResponse;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpResponse;
 import org.w3c.dom.Document;
 
 import java.util.Iterator;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/XmlUtil.java b/src/main/java/io/cdap/plugin/http/common/pagination/page/XmlUtil.java
similarity index 98%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/page/XmlUtil.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/page/XmlUtil.java
index b39a89bd..71ef81c9 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/page/XmlUtil.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/page/XmlUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.TextNode;
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/state/IndexPaginationIteratorState.java b/src/main/java/io/cdap/plugin/http/common/pagination/state/IndexPaginationIteratorState.java
similarity index 89%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/state/IndexPaginationIteratorState.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/state/IndexPaginationIteratorState.java
index 1ad9f9f7..563f430c 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/state/IndexPaginationIteratorState.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/state/IndexPaginationIteratorState.java
@@ -14,9 +14,9 @@
  * the License.
  */
 
-package io.cdap.plugin.http.source.common.pagination.state;
+package io.cdap.plugin.http.common.pagination.state;
 
-import io.cdap.plugin.http.source.common.pagination.IncrementAnIndexPaginationIterator;
+import io.cdap.plugin.http.common.pagination.IncrementAnIndexPaginationIterator;
 
 import java.util.Objects;
 
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/state/PaginationIteratorState.java b/src/main/java/io/cdap/plugin/http/common/pagination/state/PaginationIteratorState.java
similarity index 92%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/state/PaginationIteratorState.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/state/PaginationIteratorState.java
index 4ae70938..ece19006 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/state/PaginationIteratorState.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/state/PaginationIteratorState.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package io.cdap.plugin.http.source.common.pagination.state;
+package io.cdap.plugin.http.common.pagination.state;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/io/cdap/plugin/http/source/common/pagination/state/UrlPaginationIteratorState.java b/src/main/java/io/cdap/plugin/http/common/pagination/state/UrlPaginationIteratorState.java
similarity index 95%
rename from src/main/java/io/cdap/plugin/http/source/common/pagination/state/UrlPaginationIteratorState.java
rename to src/main/java/io/cdap/plugin/http/common/pagination/state/UrlPaginationIteratorState.java
index b549be51..4b3804fc 100644
--- a/src/main/java/io/cdap/plugin/http/source/common/pagination/state/UrlPaginationIteratorState.java
+++ b/src/main/java/io/cdap/plugin/http/common/pagination/state/UrlPaginationIteratorState.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package io.cdap.plugin.http.source.common.pagination.state;
+package io.cdap.plugin.http.common.pagination.state;
 
 import java.util.Objects;
 
diff --git a/src/main/java/io/cdap/plugin/http/sink/batch/HTTPSink.java b/src/main/java/io/cdap/plugin/http/sink/batch/HTTPSink.java
index 4f156440..27db4196 100644
--- a/src/main/java/io/cdap/plugin/http/sink/batch/HTTPSink.java
+++ b/src/main/java/io/cdap/plugin/http/sink/batch/HTTPSink.java
@@ -30,6 +30,8 @@
 import io.cdap.cdap.etl.api.batch.BatchSink;
 import io.cdap.cdap.etl.api.batch.BatchSinkContext;
 import io.cdap.cdap.format.StructuredRecordStringConverter;
+import io.cdap.plugin.http.common.http.HttpConstants;
+
 import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,7 +62,7 @@
  * Sink plugin to send the messages from the pipeline to an external http endpoint.
  */
 @Plugin(type = BatchSink.PLUGIN_TYPE)
-@Name("HTTP")
+@Name(HttpConstants.HTTP_PLUGIN_NAME)
 @Description("Sink plugin to send the messages from the pipeline to an external http endpoint.")
 public class HTTPSink extends BatchSink<StructuredRecord, Void, Void> {
 
diff --git a/src/main/java/io/cdap/plugin/http/source/batch/HttpBatchSource.java b/src/main/java/io/cdap/plugin/http/source/batch/HttpBatchSource.java
index dc3be1b7..72df8cad 100644
--- a/src/main/java/io/cdap/plugin/http/source/batch/HttpBatchSource.java
+++ b/src/main/java/io/cdap/plugin/http/source/batch/HttpBatchSource.java
@@ -31,8 +31,9 @@
 import io.cdap.cdap.etl.api.batch.BatchSource;
 import io.cdap.cdap.etl.api.batch.BatchSourceContext;
 import io.cdap.plugin.common.LineageRecorder;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
-import io.cdap.plugin.http.source.common.pagination.page.PageEntry;
+import io.cdap.plugin.http.common.http.HttpConstants;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.page.PageEntry;
 import org.apache.hadoop.io.NullWritable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,11 +44,9 @@
  * Plugin returns records from HTTP source specified by link. Pagination via APIs is supported.
  */
 @Plugin(type = BatchSource.PLUGIN_TYPE)
-@Name(HttpBatchSource.NAME)
+@Name(HttpConstants.HTTP_PLUGIN_NAME)
 @Description("Read data from HTTP endpoint.")
 public class HttpBatchSource extends BatchSource<NullWritable, BasePage, StructuredRecord> {
-  static final String NAME = "HTTP";
-
   private static final Logger LOG = LoggerFactory.getLogger(HttpBatchSource.class);
 
   private final HttpBatchSourceConfig config;
diff --git a/src/main/java/io/cdap/plugin/http/source/batch/HttpBatchSourceConfig.java b/src/main/java/io/cdap/plugin/http/source/batch/HttpBatchSourceConfig.java
index 1b02eece..74d3c813 100644
--- a/src/main/java/io/cdap/plugin/http/source/batch/HttpBatchSourceConfig.java
+++ b/src/main/java/io/cdap/plugin/http/source/batch/HttpBatchSourceConfig.java
@@ -15,7 +15,7 @@
  */
 package io.cdap.plugin.http.source.batch;
 
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
 
 /**
  * Provides all the configurations required for configuring the {@link HttpBatchSource} plugin.
diff --git a/src/main/java/io/cdap/plugin/http/source/batch/HttpInputFormat.java b/src/main/java/io/cdap/plugin/http/source/batch/HttpInputFormat.java
index fa9b5e10..c0d82d8f 100644
--- a/src/main/java/io/cdap/plugin/http/source/batch/HttpInputFormat.java
+++ b/src/main/java/io/cdap/plugin/http/source/batch/HttpInputFormat.java
@@ -15,7 +15,7 @@
  */
 package io.cdap.plugin.http.source.batch;
 
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.mapreduce.InputFormat;
 import org.apache.hadoop.mapreduce.InputSplit;
diff --git a/src/main/java/io/cdap/plugin/http/source/batch/HttpRecordReader.java b/src/main/java/io/cdap/plugin/http/source/batch/HttpRecordReader.java
index 993c20f4..1f172d3c 100644
--- a/src/main/java/io/cdap/plugin/http/source/batch/HttpRecordReader.java
+++ b/src/main/java/io/cdap/plugin/http/source/batch/HttpRecordReader.java
@@ -17,9 +17,9 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import io.cdap.plugin.http.source.common.pagination.BaseHttpPaginationIterator;
-import io.cdap.plugin.http.source.common.pagination.PaginationIteratorFactory;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.BaseHttpPaginationIterator;
+import io.cdap.plugin.http.common.pagination.PaginationIteratorFactory;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.mapreduce.InputSplit;
diff --git a/src/main/java/io/cdap/plugin/http/source/streaming/HttpInputDStream.java b/src/main/java/io/cdap/plugin/http/source/streaming/HttpInputDStream.java
index 2585818c..a424cb24 100644
--- a/src/main/java/io/cdap/plugin/http/source/streaming/HttpInputDStream.java
+++ b/src/main/java/io/cdap/plugin/http/source/streaming/HttpInputDStream.java
@@ -18,10 +18,10 @@
 
 import com.google.common.base.Throwables;
 import io.cdap.cdap.api.data.format.StructuredRecord;
-import io.cdap.plugin.http.source.common.pagination.BaseHttpPaginationIterator;
-import io.cdap.plugin.http.source.common.pagination.PaginationIteratorFactory;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
-import io.cdap.plugin.http.source.common.pagination.state.PaginationIteratorState;
+import io.cdap.plugin.http.common.pagination.BaseHttpPaginationIterator;
+import io.cdap.plugin.http.common.pagination.PaginationIteratorFactory;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.state.PaginationIteratorState;
 import org.apache.spark.api.java.JavaSparkContext;
 import org.apache.spark.rdd.RDD;
 import org.apache.spark.streaming.StreamingContext;
diff --git a/src/main/java/io/cdap/plugin/http/source/streaming/HttpStreamingSource.java b/src/main/java/io/cdap/plugin/http/source/streaming/HttpStreamingSource.java
index 4d9367d1..7e3d5d89 100644
--- a/src/main/java/io/cdap/plugin/http/source/streaming/HttpStreamingSource.java
+++ b/src/main/java/io/cdap/plugin/http/source/streaming/HttpStreamingSource.java
@@ -26,7 +26,9 @@
 import io.cdap.cdap.etl.api.streaming.StreamingSource;
 import io.cdap.plugin.common.Constants;
 import io.cdap.plugin.common.IdUtils;
+import io.cdap.plugin.http.common.http.HttpConstants;
 import org.apache.spark.streaming.api.java.JavaDStream;
+
 import scala.reflect.ClassTag;
 import scala.reflect.ClassTag$;
 
@@ -35,10 +37,9 @@
  * For paginated APIs once the last page is reached it waits for the next pages.
  */
 @Plugin(type = StreamingSource.PLUGIN_TYPE)
-@Name(HttpStreamingSource.NAME)
+@Name(HttpConstants.HTTP_PLUGIN_NAME)
 @Description(HttpStreamingSource.DESCRIPTION)
 public class HttpStreamingSource extends StreamingSource<StructuredRecord> {
-  static final String NAME = "HTTP";
   static final String DESCRIPTION = "Read data from HTTP endpoint periodically waiting for updates";
   private HttpStreamingSourceConfig config;
 
diff --git a/src/main/java/io/cdap/plugin/http/source/streaming/HttpStreamingSourceConfig.java b/src/main/java/io/cdap/plugin/http/source/streaming/HttpStreamingSourceConfig.java
index 333afb8e..9d3be851 100644
--- a/src/main/java/io/cdap/plugin/http/source/streaming/HttpStreamingSourceConfig.java
+++ b/src/main/java/io/cdap/plugin/http/source/streaming/HttpStreamingSourceConfig.java
@@ -19,7 +19,7 @@
 import io.cdap.cdap.api.annotation.Description;
 import io.cdap.cdap.api.annotation.Macro;
 import io.cdap.cdap.api.annotation.Name;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
 
 import javax.annotation.Nullable;
 
diff --git a/src/test/java/io/cdap/plugin/http/source/common/pagination/PaginationIteratorTest.java b/src/test/java/io/cdap/plugin/http/common/pagination/PaginationIteratorTest.java
similarity index 96%
rename from src/test/java/io/cdap/plugin/http/source/common/pagination/PaginationIteratorTest.java
rename to src/test/java/io/cdap/plugin/http/common/pagination/PaginationIteratorTest.java
index 16d22b5e..ae67e14d 100644
--- a/src/test/java/io/cdap/plugin/http/source/common/pagination/PaginationIteratorTest.java
+++ b/src/test/java/io/cdap/plugin/http/common/pagination/PaginationIteratorTest.java
@@ -14,17 +14,17 @@
  * the License.
  */
 
-package io.cdap.plugin.http.source.common.pagination;
+package io.cdap.plugin.http.common.pagination;
 
 import io.cdap.cdap.api.data.format.StructuredRecord;
 import io.cdap.cdap.api.data.schema.Schema;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpClient;
+import io.cdap.plugin.http.common.pagination.page.BasePage;
+import io.cdap.plugin.http.common.pagination.page.JSONUtil;
+import io.cdap.plugin.http.common.pagination.page.PageEntry;
+import io.cdap.plugin.http.common.pagination.page.PageFormat;
 import io.cdap.plugin.http.source.batch.HttpBatchSourceConfig;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
-import io.cdap.plugin.http.source.common.http.HttpClient;
-import io.cdap.plugin.http.source.common.pagination.page.BasePage;
-import io.cdap.plugin.http.source.common.pagination.page.JSONUtil;
-import io.cdap.plugin.http.source.common.pagination.page.PageEntry;
-import io.cdap.plugin.http.source.common.pagination.page.PageFormat;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.StatusLine;
diff --git a/src/test/java/io/cdap/plugin/http/source/common/pagination/page/JSONUtilTest.java b/src/test/java/io/cdap/plugin/http/common/pagination/page/JSONUtilTest.java
similarity index 98%
rename from src/test/java/io/cdap/plugin/http/source/common/pagination/page/JSONUtilTest.java
rename to src/test/java/io/cdap/plugin/http/common/pagination/page/JSONUtilTest.java
index 5401db9c..c94679e8 100644
--- a/src/test/java/io/cdap/plugin/http/source/common/pagination/page/JSONUtilTest.java
+++ b/src/test/java/io/cdap/plugin/http/common/pagination/page/JSONUtilTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package io.cdap.plugin.http.source.common.pagination.page;
+package io.cdap.plugin.http.common.pagination.page;
 
 import com.google.gson.JsonObject;
 import org.junit.Assert;
diff --git a/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java b/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java
index c001c648..481294cf 100644
--- a/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java
+++ b/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java
@@ -37,8 +37,8 @@
 import io.cdap.cdap.test.DataSetManager;
 import io.cdap.cdap.test.TestConfiguration;
 import io.cdap.cdap.test.WorkflowManager;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
 import io.cdap.plugin.http.source.batch.HttpBatchSource;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
diff --git a/src/test/java/io/cdap/plugin/http/etl/HttpSourceETLTest.java b/src/test/java/io/cdap/plugin/http/etl/HttpSourceETLTest.java
index 07a594e3..74123c74 100644
--- a/src/test/java/io/cdap/plugin/http/etl/HttpSourceETLTest.java
+++ b/src/test/java/io/cdap/plugin/http/etl/HttpSourceETLTest.java
@@ -22,7 +22,7 @@
 import io.cdap.cdap.api.data.schema.Schema;
 import io.cdap.cdap.etl.mock.test.HydratorTestBase;
 import io.cdap.cdap.test.TestConfiguration;
-import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.BaseHttpSourceConfig;
 import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Rule;
diff --git a/widgets/HTTP-action.json b/widgets/HTTP-action.json
new file mode 100644
index 00000000..fc94de3e
--- /dev/null
+++ b/widgets/HTTP-action.json
@@ -0,0 +1,443 @@
+{
+  "metadata": {
+    "spec-version": "1.5"
+  },
+  "configuration-groups": [
+    {
+      "label": "General",
+      "properties": [
+        {
+          "widget-type": "textbox",
+          "label": "URL",
+          "name": "url"
+        },
+        {
+          "widget-type": "select",
+          "label": "HTTP Method",
+          "name": "httpMethod",
+          "widget-attributes": {
+            "values": [
+              "GET",
+              "POST",
+              "PUT",
+              "DELETE",
+              "HEAD"
+            ],
+            "default": "GET"
+          }
+        },
+        {
+          "widget-type": "keyvalue",
+          "label": "Headers",
+          "name": "headers",
+          "widget-attributes": {
+            "showDelimiter": "false"
+          }
+        },
+        {
+          "widget-type": "textarea",
+          "name": "requestBody",
+          "label": "Request Body",
+          "widget-attributes": {
+            "rows": "5"
+          }
+        }
+      ]
+    },
+    {
+      "label": "OAuth2",
+      "properties": [
+        {
+          "widget-type": "toggle",
+          "label": "OAuth2 Enabled",
+          "name": "oauth2Enabled",
+          "widget-attributes": {
+            "default": "false",
+            "on": {
+              "label": "True",
+              "value": "true"
+            },
+            "off": {
+              "label": "False",
+              "value": "false"
+            }
+          }
+        },
+        {
+          "widget-type": "textbox",
+          "label": "Auth URL",
+          "name": "authUrl"
+        },
+        {
+          "widget-type": "textbox",
+          "label": "Token URL",
+          "name": "tokenUrl"
+        },
+        {
+          "widget-type": "textbox",
+          "label": "Client ID",
+          "name": "clientId"
+        },
+        {
+          "widget-type": "password",
+          "label": "Client Secret",
+          "name": "clientSecret"
+        },
+        {
+          "widget-type": "textbox",
+          "label": "Scopes",
+          "name": "scopes"
+        },
+        {
+          "widget-type": "textbox",
+          "label": "Refresh Token",
+          "name": "refreshToken"
+        }
+      ]
+    },
+    {
+      "label": "Basic Authentication",
+      "properties": [
+        {
+          "widget-type": "textbox",
+          "label": "Username",
+          "name": "username"
+        },
+        {
+          "widget-type": "password",
+          "label": "Password",
+          "name": "password"
+        }
+      ]
+    },
+    {
+      "label": "HTTP Proxy",
+      "properties": [
+        {
+          "widget-type": "textbox",
+          "label": "Proxy URL",
+          "name": "proxyUrl"
+        },
+        {
+          "widget-type": "textbox",
+          "label": "Username",
+          "name": "proxyUsername"
+        },
+        {
+          "widget-type": "password",
+          "label": "Password",
+          "name": "proxyPassword"
+        }
+      ]
+    },
+    {
+      "label": "Error Handling",
+      "properties": [
+        {
+          "widget-type": "keyvalue-dropdown",
+          "label": "HTTP Errors Handling",
+          "name": "httpErrorsHandling",
+          "widget-attributes": {
+            "default": "2..:Success,.*:Fail",
+            "showDelimiter": "false",
+            "dropdownOptions": [
+              "Success",
+              "Fail",
+              "Skip",
+              "Send to error",
+              "Retry and fail",
+              "Retry and skip",
+              "Retry and send to error"
+            ],
+            "key-placeholder": "HTTP Status Code Regex"
+          }
+        },
+        {
+          "widget-type": "radio-group",
+          "label": "Non-HTTP Error Handling",
+          "name": "errorHandling",
+          "widget-attributes": {
+            "layout": "inline",
+            "default": "stopOnError",
+            "options": [
+              {
+                "id": "stopOnError",
+                "label": "Stop on error"
+              },
+              {
+                "id": "sendToError",
+                "label": "Send to error"
+              },
+              {
+                "id": "skipOnError",
+                "label": "Skip on error"
+              }
+            ]
+          }
+        },
+        {
+          "widget-type": "number",
+          "label": "Connect Timeout",
+          "name": "connectTimeout",
+          "widget-attributes": {
+            "min": "0",
+            "default": "120"
+          }
+        },
+        {
+          "widget-type": "number",
+          "label": "Read Timeout",
+          "name": "readTimeout",
+          "widget-attributes": {
+            "min": "0",
+            "default": "120"
+          }
+        }
+      ]
+    },
+    {
+      "label": "SSL/TLS",
+      "properties": [
+        {
+          "widget-type": "toggle",
+          "label": "Verify HTTPS Trust Certificates",
+          "name": "verifyHttps",
+          "widget-attributes": {
+            "default": "true",
+            "on": {
+              "label": "True",
+              "value": "true"
+            },
+            "off": {
+              "label": "False",
+              "value": "false"
+            }
+          }
+        },
+        {
+          "widget-type": "textbox",
+          "label": "Keystore File",
+          "name": "keystoreFile"
+        },
+        {
+          "widget-type": "select",
+          "label": "Keystore Type",
+          "name": "keystoreType",
+          "widget-attributes": {
+            "default": "Java KeyStore (JKS)",
+            "values": [
+              "Java KeyStore (JKS)",
+              "Java Cryptography Extension KeyStore (JCEKS)",
+              "PKCS #12"
+            ]
+          }
+        },
+        {
+          "widget-type": "password",
+          "label": "Keystore Password",
+          "name": "keystorePassword"
+        },
+        {
+          "widget-type": "textbox",
+          "label": "Keystore Key Algorithm",
+          "name": "keystoreKeyAlgorithm",
+          "widget-attributes": {
+            "default": "SunX509"
+          }
+        },
+        {
+          "widget-type": "textbox",
+          "label": "Keystore Cert Alias",
+          "name": "keystoreCertAlias"
+        },
+        {
+          "widget-type": "textbox",
+          "label": "TrustStore File",
+          "name": "trustStoreFile"
+        },
+        {
+          "widget-type": "select",
+          "label": "TrustStore Type",
+          "name": "trustStoreType",
+          "widget-attributes": {
+            "default": "Java KeyStore (JKS)",
+            "values": [
+              "Java KeyStore (JKS)",
+              "Java Cryptography Extension KeyStore (JCEKS)",
+              "PKCS #12"
+            ]
+          }
+        },
+        {
+          "widget-type": "password",
+          "label": "TrustStore Password",
+          "name": "trustStorePassword"
+        },
+        {
+          "widget-type": "textbox",
+          "label": "TrustStore Key Algorithm",
+          "name": "trustStoreKeyAlgorithm",
+          "widget-attributes": {
+            "default": "SunX509"
+          }
+        },
+        {
+          "widget-type": "csv",
+          "label": "Transport Protocols",
+          "name": "transportProtocols",
+          "widget-attributes": {
+            "default": "TLSv1.2"
+          }
+        },
+        {
+          "widget-type": "textbox",
+          "label": "Cipher Suites",
+          "name": "cipherSuites"
+        }
+      ]
+    }
+  ],
+  "filters": [
+    {
+      "name": "Proxy authentication",
+      "condition": {
+        "property": "proxyUrl",
+        "operator": "exists"
+      },
+      "show": [
+        {
+          "name": "proxyUsername",
+          "type": "property"
+        },
+        {
+          "name": "proxyPassword",
+          "type": "property"
+        }
+      ]
+    },
+    {
+      "name": "Token in Response Body",
+      "condition": {
+        "property": "paginationType",
+        "operator": "equal to",
+        "value": "Token in response body"
+      },
+      "show": [
+        {
+          "name": "nextPageTokenPath",
+          "type": "property"
+        },
+        {
+          "name": "nextPageUrlParameter",
+          "type": "property"
+        }
+      ]
+    },
+    {
+      "name": "Link in response body",
+      "condition": {
+        "property": "paginationType",
+        "operator": "equal to",
+        "value": "Link in response body"
+      },
+      "show": [
+        {
+          "name": "nextPageFieldPath",
+          "type": "property"
+        }
+      ]
+    },
+    {
+      "name": "OAuth 2 disabled",
+      "condition": {
+        "property": "oauth2Enabled",
+        "operator": "equal to",
+        "value": "false"
+      },
+      "show": [
+        {
+          "name": "username",
+          "type": "property"
+        },
+        {
+          "name": "password",
+          "type": "property"
+        }
+      ]
+    },
+    {
+      "name": "OAuth 2 enabled",
+      "condition": {
+        "property": "oauth2Enabled",
+        "operator": "equal to",
+        "value": "true"
+      },
+      "show": [
+        {
+          "name": "authUrl",
+          "type": "property"
+        },
+        {
+          "name": "tokenUrl",
+          "type": "property"
+        },
+        {
+          "name": "clientId",
+          "type": "property"
+        },
+        {
+          "name": "clientSecret",
+          "type": "property"
+        },
+        {
+          "name": "scopes",
+          "type": "property"
+        },
+        {
+          "name": "refreshToken",
+          "type": "property"
+        }
+      ]
+    },
+    {
+      "name": "SSL HTTPS Verification",
+      "condition": {
+        "property": "verifyHttps",
+        "operator": "equal to",
+        "value": "true"
+      },
+      "show": [
+        {
+          "name": "trustStoreFile",
+          "type": "property"
+        },
+        {
+          "name": "trustStoreType",
+          "type": "property"
+        },
+        {
+          "name": "trustStorePassword",
+          "type": "property"
+        },
+        {
+          "name": "trustStoreKeyAlgorithm",
+          "type": "property"
+        }
+      ]
+    },
+    {
+      "name": "CSV Formatting",
+      "condition": {
+        "property": "format",
+        "operator": "equal to",
+        "value": "csv"
+      },
+      "show": [
+        {
+          "name": "csvSkipFirstRow",
+          "type": "property"
+        }
+      ]
+    }
+  ]
+}

From 6ee6f3c776f53adce41cf4bbeb2c6348ee8256d3 Mon Sep 17 00:00:00 2001
From: dgrinenko <dgrinenko@cybervisiontech.com>
Date: Wed, 15 Dec 2021 12:24:06 +0200
Subject: [PATCH 3/5] Fix plugin description typo and hide plugin properties
 from the user

---
 .../cdap/plugin/http/action/HttpAction.java   |  3 +-
 .../plugin/http/action/HttpActionConfig.java  |  4 ++
 widgets/HTTP-action.json                      | 54 ++++++-------------
 3 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/src/main/java/io/cdap/plugin/http/action/HttpAction.java b/src/main/java/io/cdap/plugin/http/action/HttpAction.java
index a2a2a76b..ee48628e 100644
--- a/src/main/java/io/cdap/plugin/http/action/HttpAction.java
+++ b/src/main/java/io/cdap/plugin/http/action/HttpAction.java
@@ -42,9 +42,8 @@
  */
 @Plugin(type = Action.PLUGIN_TYPE)
 @Name(HttpConstants.HTTP_PLUGIN_NAME)
-@Description("Action that runs a MySQL command")
+@Description("Action that runs a HTTP command")
 public class HttpAction extends Action {
-
   private final HttpActionConfig config;
 
   public HttpAction(HttpActionConfig config) {
diff --git a/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java b/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java
index 14cc6fca..1b44c272 100644
--- a/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java
+++ b/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java
@@ -41,6 +41,10 @@
  */
 public class HttpActionConfig extends PluginConfig implements IHttpConfig {
 
+  @Name("alwaysHidden")
+  @Description("")
+  protected String alwaysHidden;
+
   @Name(HttpConstants.PROPERTY_URL)
   @Description("Url to fetch to the first page. The url must start with a protocol (e.g. http://).")
   @Macro
diff --git a/widgets/HTTP-action.json b/widgets/HTTP-action.json
index fc94de3e..d787b374 100644
--- a/widgets/HTTP-action.json
+++ b/widgets/HTTP-action.json
@@ -6,6 +6,11 @@
     {
       "label": "General",
       "properties": [
+        {
+          "widget-type": "hidden",
+          "name": "alwaysHidden",
+          "default": "true"
+        },
         {
           "widget-type": "textbox",
           "label": "URL",
@@ -144,7 +149,6 @@
               "Success",
               "Fail",
               "Skip",
-              "Send to error",
               "Retry and fail",
               "Retry and skip",
               "Retry and send to error"
@@ -316,51 +320,37 @@
       ]
     },
     {
-      "name": "Token in Response Body",
+      "name": "OAuth 2 disabled",
       "condition": {
-        "property": "paginationType",
+        "property": "oauth2Enabled",
         "operator": "equal to",
-        "value": "Token in response body"
+        "value": "false"
       },
       "show": [
         {
-          "name": "nextPageTokenPath",
+          "name": "username",
           "type": "property"
         },
         {
-          "name": "nextPageUrlParameter",
-          "type": "property"
-        }
-      ]
-    },
-    {
-      "name": "Link in response body",
-      "condition": {
-        "property": "paginationType",
-        "operator": "equal to",
-        "value": "Link in response body"
-      },
-      "show": [
-        {
-          "name": "nextPageFieldPath",
+          "name": "password",
           "type": "property"
         }
       ]
     },
     {
-      "name": "OAuth 2 disabled",
+      "name": "Hide properties",
       "condition": {
-        "property": "oauth2Enabled",
-        "operator": "equal to",
+        "property": "alwaysHidden",
+        "operator": "equals to",
         "value": "false"
       },
       "show": [
         {
-          "name": "username",
+          "name": "httpErrorsHandling",
           "type": "property"
         },
         {
-          "name": "password",
+          "name": "errorHandling",
           "type": "property"
         }
       ]
@@ -424,20 +414,6 @@
           "type": "property"
         }
       ]
-    },
-    {
-      "name": "CSV Formatting",
-      "condition": {
-        "property": "format",
-        "operator": "equal to",
-        "value": "csv"
-      },
-      "show": [
-        {
-          "name": "csvSkipFirstRow",
-          "type": "property"
-        }
-      ]
     }
   ]
 }

From d2d5bc941f1011601b03f257129e803bf82b775a Mon Sep 17 00:00:00 2001
From: dgrinenko <dgrinenko@cybervisiontech.com>
Date: Thu, 16 Dec 2021 11:36:21 +0200
Subject: [PATCH 4/5] Set of fixes and cleanup

---
 .../cdap/plugin/http/action/HttpAction.java   |  28 +++-
 .../plugin/http/action/HttpActionConfig.java  |  28 +++-
 .../http/common/BaseHttpSourceConfig.java     | 156 +++++++-----------
 .../http/common/error/HttpErrorHandler.java   |  15 +-
 .../plugin/http/common/http/HttpClient.java   |  24 +--
 .../plugin/http/common/http/IHttpConfig.java  |   2 +-
 .../http/etl/BaseHttpBatchSourceETLTest.java  |  25 +--
 .../plugin/http/etl/HttpSourceETLTest.java    |  63 +++----
 widgets/HTTP-action.json                      |  37 +----
 widgets/HTTP-batchsource.json                 |   2 +-
 10 files changed, 180 insertions(+), 200 deletions(-)

diff --git a/src/main/java/io/cdap/plugin/http/action/HttpAction.java b/src/main/java/io/cdap/plugin/http/action/HttpAction.java
index ee48628e..e6118092 100644
--- a/src/main/java/io/cdap/plugin/http/action/HttpAction.java
+++ b/src/main/java/io/cdap/plugin/http/action/HttpAction.java
@@ -32,6 +32,8 @@
 import org.awaitility.pollinterval.FixedPollInterval;
 import org.awaitility.pollinterval.IterativePollInterval;
 import org.awaitility.pollinterval.PollInterval;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -44,6 +46,8 @@
 @Name(HttpConstants.HTTP_PLUGIN_NAME)
 @Description("Action that runs a HTTP command")
 public class HttpAction extends Action {
+
+  private static final Logger LOG = LoggerFactory.getLogger(HttpAction.class);
   private final HttpActionConfig config;
 
   public HttpAction(HttpActionConfig config) {
@@ -51,11 +55,24 @@ public HttpAction(HttpActionConfig config) {
   }
 
     private boolean makeRequest(HttpClient httpClient, String uri, HttpErrorHandler errorHandler) throws IOException {
-    HttpResponse response = new HttpResponse(httpClient.executeHTTP(uri));
-    RetryableErrorHandling errorHandlingStrategy = errorHandler.getErrorHandlingStrategy(response.getStatusCode());
+      try (HttpResponse response = new HttpResponse(httpClient.executeHTTP(uri))) {
+        RetryableErrorHandling errorHandlingStrategy = errorHandler.getErrorHandlingStrategy(response.getStatusCode());
 
-    response.close();
-    return !errorHandlingStrategy.shouldRetry();
+        if (errorHandlingStrategy == RetryableErrorHandling.FAIL) {
+          String body = "null";
+          try {
+            body = response.getBody();
+          } catch (Exception ignore) {
+          }
+          LOG.warn(
+            String.format("Request to the url '%s' failed with error code %s and message: %s",
+                    uri,
+                    response.getStatusCode(),
+                    body
+          ));
+        }
+        return !errorHandlingStrategy.shouldRetry();
+      }
   }
 
   @Override
@@ -71,7 +88,8 @@ public void run(ActionContext actionContext) throws Exception {
         .pollInterval(pollInterval)
         .timeout(config.getMaxRetryDuration(), TimeUnit.SECONDS)
         .until(() -> makeRequest(httpClient, config.getUrl(), httpErrorHandler));
-    } catch (ConditionTimeoutException ignored) {
+    } catch (ConditionTimeoutException e) {
+      LOG.warn(String.format("Request to the url '%s' failed due to timeout", config.getUrl()));
     }
   }
 
diff --git a/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java b/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java
index 1b44c272..101b8c98 100644
--- a/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java
+++ b/src/main/java/io/cdap/plugin/http/action/HttpActionConfig.java
@@ -24,15 +24,18 @@
 import io.cdap.plugin.http.common.RetryPolicy;
 import io.cdap.plugin.http.common.error.ErrorHandling;
 import io.cdap.plugin.http.common.error.HttpErrorHandlerEntity;
+import io.cdap.plugin.http.common.error.RetryableErrorHandling;
 import io.cdap.plugin.http.common.http.HttpConstants;
 import io.cdap.plugin.http.common.http.IHttpConfig;
 import io.cdap.plugin.http.common.http.KeyStoreType;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 import javax.annotation.Nullable;
 
@@ -41,10 +44,6 @@
  */
 public class HttpActionConfig extends PluginConfig implements IHttpConfig {
 
-  @Name("alwaysHidden")
-  @Description("")
-  protected String alwaysHidden;
-
   @Name(HttpConstants.PROPERTY_URL)
   @Description("Url to fetch to the first page. The url must start with a protocol (e.g. http://).")
   @Macro
@@ -297,7 +296,24 @@ public ErrorHandling getErrorHandling() {
 
   @Override
   public List<HttpErrorHandlerEntity> getHttpErrorHandlingEntries() {
-    return Collections.emptyList();
+    Map<String, String> httpErrorsHandlingMap = BaseHttpSourceConfig.getMapFromKeyValueString(httpErrorsHandling);
+    List<HttpErrorHandlerEntity> results = new ArrayList<>(httpErrorsHandlingMap.size());
+
+    for (Map.Entry<String, String> entry : httpErrorsHandlingMap.entrySet()) {
+      String regex = entry.getKey();
+      try {
+        results.add(new HttpErrorHandlerEntity(Pattern.compile(regex),
+                BaseHttpSourceConfig.getEnumValueByString(RetryableErrorHandling.class,
+                        entry.getValue(), HttpConstants.PROPERTY_HTTP_ERROR_HANDLING)));
+      } catch (PatternSyntaxException e) {
+        // We embed causing exception message into this one. Since this message is shown on UI when validation fails.
+        throw new InvalidConfigPropertyException(
+                String.format("Error handling regex '%s' is not valid. %s", regex, e.getMessage()),
+                HttpConstants.PROPERTY_HTTP_ERROR_HANDLING
+        );
+      }
+    }
+    return results;
   }
 
   @Override
diff --git a/src/main/java/io/cdap/plugin/http/common/BaseHttpSourceConfig.java b/src/main/java/io/cdap/plugin/http/common/BaseHttpSourceConfig.java
index cfb68a82..6933ce98 100644
--- a/src/main/java/io/cdap/plugin/http/common/BaseHttpSourceConfig.java
+++ b/src/main/java/io/cdap/plugin/http/common/BaseHttpSourceConfig.java
@@ -26,6 +26,7 @@
 import io.cdap.plugin.http.common.error.ErrorHandling;
 import io.cdap.plugin.http.common.error.HttpErrorHandlerEntity;
 import io.cdap.plugin.http.common.error.RetryableErrorHandling;
+import io.cdap.plugin.http.common.http.HttpConstants;
 import io.cdap.plugin.http.common.http.IHttpConfig;
 import io.cdap.plugin.http.common.http.KeyStoreType;
 import io.cdap.plugin.http.common.pagination.PaginationIteratorFactory;
@@ -51,26 +52,12 @@
  * Base configuration for HTTP Streaming and Batch plugins.
  */
 public abstract class BaseHttpSourceConfig extends ReferencePluginConfig implements IHttpConfig {
-  public static final String PROPERTY_URL = "url";
-  public static final String PROPERTY_HTTP_METHOD = "httpMethod";
-  public static final String PROPERTY_HEADERS = "headers";
-  public static final String PROPERTY_REQUEST_BODY = "requestBody";
   public static final String PROPERTY_FORMAT = "format";
   public static final String PROPERTY_RESULT_PATH = "resultPath";
   public static final String PROPERTY_FIELDS_MAPPING = "fieldsMapping";
   public static final String PROPERTY_CSV_SKIP_FIRST_ROW = "csvSkipFirstRow";
-  public static final String PROPERTY_USERNAME = "username";
-  public static final String PROPERTY_PASSWORD = "password";
-  public static final String PROPERTY_PROXY_URL = "proxyUrl";
-  public static final String PROPERTY_PROXY_USERNAME = "proxyUsername";
-  public static final String PROPERTY_PROXY_PASSWORD = "proxyPassword";
-  public static final String PROPERTY_HTTP_ERROR_HANDLING = "httpErrorsHandling";
-  public static final String PROPERTY_ERROR_HANDLING = "errorHandling";
-  public static final String PROPERTY_RETRY_POLICY = "retryPolicy";
   public static final String PROPERTY_LINEAR_RETRY_INTERVAL = "linearRetryInterval";
   public static final String PROPERTY_MAX_RETRY_DURATION = "maxRetryDuration";
-  public static final String PROPERTY_CONNECT_TIMEOUT = "connectTimeout";
-  public static final String PROPERTY_READ_TIMEOUT = "readTimeout";
   public static final String PROPERTY_PAGINATION_TYPE = "paginationType";
   public static final String PROPERTY_START_INDEX = "startIndex";
   public static final String PROPERTY_MAX_INDEX = "maxIndex";
@@ -80,49 +67,27 @@ public abstract class BaseHttpSourceConfig extends ReferencePluginConfig impleme
   public static final String PROPERTY_NEXT_PAGE_URL_PARAMETER = "nextPageUrlParameter";
   public static final String PROPERTY_CUSTOM_PAGINATION_CODE = "customPaginationCode";
   public static final String PROPERTY_WAIT_TIME_BETWEEN_PAGES = "waitTimeBetweenPages";
-  public static final String PROPERTY_OAUTH2_ENABLED = "oauth2Enabled";
-  public static final String PROPERTY_AUTH_URL = "authUrl";
-  public static final String PROPERTY_TOKEN_URL = "tokenUrl";
-  public static final String PROPERTY_CLIENT_ID = "clientId";
-  public static final String PROPERTY_CLIENT_SECRET = "clientSecret";
-  public static final String PROPERTY_SCOPES = "scopes";
-  public static final String PROPERTY_REFRESH_TOKEN = "refreshToken";
-  public static final String PROPERTY_VERIFY_HTTPS = "verifyHttps";
-  public static final String PROPERTY_KEYSTORE_FILE = "keystoreFile";
-  public static final String PROPERTY_KEYSTORE_TYPE = "keystoreType";
-  public static final String PROPERTY_KEYSTORE_PASSWORD = "keystorePassword";
-  public static final String PROPERTY_KEYSTORE_KEY_ALGORITHM = "keystoreKeyAlgorithm";
-  public static final String PROPERTY_TRUSTSTORE_FILE = "trustStoreFile";
-  public static final String PROPERTY_TRUSTSTORE_TYPE = "trustStoreType";
-  public static final String PROPERTY_TRUSTSTORE_PASSWORD = "trustStorePassword";
-  public static final String PROPERTY_TRUSTSTORE_KEY_ALGORITHM = "trustStoreKeyAlgorithm";
-  public static final String PROPERTY_TRANSPORT_PROTOCOLS = "transportProtocols";
-  public static final String PROPERTY_CIPHER_SUITES = "cipherSuites";
-  public static final String PROPERTY_SCHEMA = "schema";
-
-  public static final String PROPERTY_KEYSTORE_CERT_ALIAS = "keystoreCertAlias";
-
   public static final String PAGINATION_INDEX_PLACEHOLDER_REGEX = "\\{pagination.index\\}";
   public static final String PAGINATION_INDEX_PLACEHOLDER = "{pagination.index}";
 
-  @Name(PROPERTY_URL)
+  @Name(HttpConstants.PROPERTY_URL)
   @Description("Url to fetch to the first page. The url must start with a protocol (e.g. http://).")
   @Macro
   protected String url;
 
-  @Name(PROPERTY_HTTP_METHOD)
+  @Name(HttpConstants.PROPERTY_HTTP_METHOD)
   @Description("HTTP request method.")
   @Macro
   protected String httpMethod;
 
-  @Name(PROPERTY_HEADERS)
+  @Name(HttpConstants.PROPERTY_HEADERS)
   @Nullable
   @Description("Headers to send with each HTTP request.")
   @Macro
   protected String headers;
 
   @Nullable
-  @Name(PROPERTY_REQUEST_BODY)
+  @Name(HttpConstants.PROPERTY_REQUEST_BODY)
   @Description("Body to send with each HTTP request.")
   @Macro
   protected String requestBody;
@@ -155,48 +120,48 @@ public abstract class BaseHttpSourceConfig extends ReferencePluginConfig impleme
   protected String csvSkipFirstRow;
 
   @Nullable
-  @Name(PROPERTY_USERNAME)
+  @Name(HttpConstants.PROPERTY_USERNAME)
   @Description("Username for basic authentication.")
   @Macro
   protected String username;
 
   @Nullable
-  @Name(PROPERTY_PASSWORD)
+  @Name(HttpConstants.PROPERTY_PASSWORD)
   @Description("Password for basic authentication.")
   @Macro
   protected String password;
 
   @Nullable
-  @Name(PROPERTY_PROXY_URL)
+  @Name(HttpConstants.PROPERTY_PROXY_URL)
   @Description("Proxy URL. Must contain a protocol, address and port.")
   @Macro
   protected String proxyUrl;
 
   @Nullable
-  @Name(PROPERTY_PROXY_USERNAME)
+  @Name(HttpConstants.PROPERTY_PROXY_USERNAME)
   @Description("Proxy username.")
   @Macro
   protected String proxyUsername;
 
   @Nullable
-  @Name(PROPERTY_PROXY_PASSWORD)
+  @Name(HttpConstants.PROPERTY_PROXY_PASSWORD)
   @Description("Proxy password.")
   @Macro
   protected String proxyPassword;
 
   @Nullable
-  @Name(PROPERTY_HTTP_ERROR_HANDLING)
+  @Name(HttpConstants.PROPERTY_HTTP_ERROR_HANDLING)
   @Description("Defines the error handling strategy to use for certain HTTP response codes." +
     "The left column contains a regular expression for HTTP status code. The right column contains an action which" +
     "is done in case of match. If HTTP status code matches multiple regular expressions, " +
     "the first specified in mapping is matched.")
   protected String httpErrorsHandling;
 
-  @Name(PROPERTY_ERROR_HANDLING)
+  @Name(HttpConstants.PROPERTY_ERROR_HANDLING)
   @Description("Error handling strategy to use when the HTTP response cannot be transformed to an output record.")
   protected String errorHandling;
 
-  @Name(PROPERTY_RETRY_POLICY)
+  @Name(HttpConstants.PROPERTY_RETRY_POLICY)
   @Description("Policy used to calculate delay between retries.")
   protected String retryPolicy;
 
@@ -211,12 +176,12 @@ public abstract class BaseHttpSourceConfig extends ReferencePluginConfig impleme
   @Macro
   protected Long maxRetryDuration;
 
-  @Name(PROPERTY_CONNECT_TIMEOUT)
+  @Name(HttpConstants.PROPERTY_CONNECT_TIMEOUT)
   @Description("Maximum time in seconds connection initialization is allowed to take.")
   @Macro
   protected Integer connectTimeout;
 
-  @Name(PROPERTY_READ_TIMEOUT)
+  @Name(HttpConstants.PROPERTY_READ_TIMEOUT)
   @Description("Maximum time in seconds fetching data from the server is allowed to take.")
   @Macro
   protected Integer readTimeout;
@@ -278,47 +243,47 @@ public abstract class BaseHttpSourceConfig extends ReferencePluginConfig impleme
   @Macro
   protected Long waitTimeBetweenPages;
 
-  @Name(PROPERTY_OAUTH2_ENABLED)
+  @Name(HttpConstants.PROPERTY_OAUTH2_ENABLED)
   @Description("If true, plugin will perform OAuth2 authentication.")
   protected String oauth2Enabled;
 
   @Nullable
-  @Name(PROPERTY_AUTH_URL)
+  @Name(HttpConstants.PROPERTY_AUTH_URL)
   @Description("Endpoint for the authorization server used to retrieve the authorization code.")
   @Macro
   protected String authUrl;
 
   @Nullable
-  @Name(PROPERTY_TOKEN_URL)
+  @Name(HttpConstants.PROPERTY_TOKEN_URL)
   @Description("Endpoint for the resource server, which exchanges the authorization code for an access token.")
   @Macro
   protected String tokenUrl;
 
   @Nullable
-  @Name(PROPERTY_CLIENT_ID)
+  @Name(HttpConstants.PROPERTY_CLIENT_ID)
   @Description("Client identifier obtained during the Application registration process.")
   @Macro
   protected String clientId;
 
   @Nullable
-  @Name(PROPERTY_CLIENT_SECRET)
+  @Name(HttpConstants.PROPERTY_CLIENT_SECRET)
   @Description("Client secret obtained during the Application registration process.")
   @Macro
   protected String clientSecret;
 
   @Nullable
-  @Name(PROPERTY_SCOPES)
+  @Name(HttpConstants.PROPERTY_SCOPES)
   @Description("Scope of the access request, which might have multiple space-separated values.")
   @Macro
   protected String scopes;
 
   @Nullable
-  @Name(PROPERTY_REFRESH_TOKEN)
+  @Name(HttpConstants.PROPERTY_REFRESH_TOKEN)
   @Description("Token used to receive accessToken, which is end product of OAuth2.")
   @Macro
   protected String refreshToken;
 
-  @Name(PROPERTY_VERIFY_HTTPS)
+  @Name(HttpConstants.PROPERTY_VERIFY_HTTPS)
   @Description("If false, untrusted trust certificates (e.g. self signed), will not lead to an" +
     "error. Do not disable this in production environment on a network you do not entirely trust. " +
     "Especially public internet.")
@@ -326,73 +291,73 @@ public abstract class BaseHttpSourceConfig extends ReferencePluginConfig impleme
   protected String verifyHttps;
 
   @Nullable
-  @Name(PROPERTY_KEYSTORE_FILE)
+  @Name(HttpConstants.PROPERTY_KEYSTORE_FILE)
   @Description("A path to a file which contains keystore.")
   @Macro
   protected String keystoreFile;
 
   @Nullable
-  @Name(PROPERTY_KEYSTORE_TYPE)
+  @Name(HttpConstants.PROPERTY_KEYSTORE_TYPE)
   @Description("Format of a keystore.")
   @Macro
   protected String keystoreType;
 
   @Nullable
-  @Name(PROPERTY_KEYSTORE_PASSWORD)
+  @Name(HttpConstants.PROPERTY_KEYSTORE_PASSWORD)
   @Description("Password for a keystore. If a keystore is not password protected leave it empty.")
   @Macro
   protected String keystorePassword;
 
   @Nullable
-  @Name(PROPERTY_KEYSTORE_KEY_ALGORITHM)
+  @Name(HttpConstants.PROPERTY_KEYSTORE_KEY_ALGORITHM)
   @Description("An algorithm used for keystore.")
   @Macro
   protected String keystoreKeyAlgorithm;
 
   @Nullable
-  @Name(PROPERTY_TRUSTSTORE_FILE)
+  @Name(HttpConstants.PROPERTY_TRUSTSTORE_FILE)
   @Description("A path to a file which contains truststore.")
   @Macro
   protected String trustStoreFile;
 
   @Nullable
-  @Name(PROPERTY_TRUSTSTORE_TYPE)
+  @Name(HttpConstants.PROPERTY_TRUSTSTORE_TYPE)
   @Description("Format of a truststore.")
   @Macro
   protected String trustStoreType;
 
   @Nullable
-  @Name(PROPERTY_TRUSTSTORE_PASSWORD)
+  @Name(HttpConstants.PROPERTY_TRUSTSTORE_PASSWORD)
   @Description("Password for a truststore. If a truststore is not password protected leave it empty.")
   @Macro
   protected String trustStorePassword;
 
   @Nullable
-  @Name(PROPERTY_TRUSTSTORE_KEY_ALGORITHM)
+  @Name(HttpConstants.PROPERTY_TRUSTSTORE_KEY_ALGORITHM)
   @Description("An algorithm used for truststore.")
   @Macro
   protected String trustStoreKeyAlgorithm;
 
   @Nullable
-  @Name(PROPERTY_TRANSPORT_PROTOCOLS)
+  @Name(HttpConstants.PROPERTY_TRANSPORT_PROTOCOLS)
   @Description("Transport protocols which are allowed for connection.")
   @Macro
   protected String transportProtocols;
 
   @Nullable
-  @Name(PROPERTY_CIPHER_SUITES)
+  @Name(HttpConstants.PROPERTY_CIPHER_SUITES)
   @Description("Cipher suites which are allowed for connection. " +
     "Colons, commas or spaces are also acceptable separators.")
   @Macro
   protected String cipherSuites;
 
-  @Name(PROPERTY_SCHEMA)
+  @Name(HttpConstants.PROPERTY_SCHEMA)
   @Macro
   @Nullable
   @Description("Output schema. Is required to be set.")
   protected String schema;
 
-  @Name(PROPERTY_KEYSTORE_CERT_ALIAS)
+  @Name(HttpConstants.PROPERTY_KEYSTORE_CERT_ALIAS)
   @Macro
   @Nullable
   @Description("Alias of the key in the keystore to be used for communication")
@@ -469,11 +434,11 @@ public String getHttpErrorsHandling() {
   }
 
   public ErrorHandling getErrorHandling() {
-    return getEnumValueByString(ErrorHandling.class, errorHandling, PROPERTY_ERROR_HANDLING);
+    return getEnumValueByString(ErrorHandling.class, errorHandling, HttpConstants.PROPERTY_ERROR_HANDLING);
   }
 
   public RetryPolicy getRetryPolicy() {
-    return getEnumValueByString(RetryPolicy.class, retryPolicy, PROPERTY_RETRY_POLICY);
+    return getEnumValueByString(RetryPolicy.class, retryPolicy, HttpConstants.PROPERTY_RETRY_POLICY);
   }
 
   @Nullable
@@ -582,7 +547,7 @@ public String getKeystoreFile() {
 
   @Nullable
   public KeyStoreType getKeystoreType() {
-    return getEnumValueByString(KeyStoreType.class, keystoreType, PROPERTY_KEYSTORE_TYPE);
+    return getEnumValueByString(KeyStoreType.class, keystoreType, HttpConstants.PROPERTY_KEYSTORE_TYPE);
   }
 
   @Nullable
@@ -602,7 +567,7 @@ public String getTrustStoreFile() {
 
   @Nullable
   public KeyStoreType getTrustStoreType() {
-    return getEnumValueByString(KeyStoreType.class, trustStoreType, PROPERTY_TRUSTSTORE_TYPE);
+    return getEnumValueByString(KeyStoreType.class, trustStoreType, HttpConstants.PROPERTY_TRUSTSTORE_TYPE);
   }
 
   @Nullable
@@ -631,7 +596,7 @@ public Schema getSchema() {
       return Strings.isNullOrEmpty(schema) ? null : Schema.parseJson(schema);
     } catch (IOException e) {
       throw new InvalidConfigPropertyException("Unable to parse output schema: " +
-                                                 schema, e, PROPERTY_SCHEMA);
+                                                 schema, e, HttpConstants.PROPERTY_SCHEMA);
     }
   }
 
@@ -654,12 +619,13 @@ public List<HttpErrorHandlerEntity> getHttpErrorHandlingEntries() {
       try {
         results.add(new HttpErrorHandlerEntity(Pattern.compile(regex),
                    getEnumValueByString(RetryableErrorHandling.class,
-                                        entry.getValue(), PROPERTY_HTTP_ERROR_HANDLING)));
+                                        entry.getValue(), HttpConstants.PROPERTY_HTTP_ERROR_HANDLING)));
       } catch (PatternSyntaxException e) {
         // We embed causing exception message into this one. Since this message is shown on UI when validation fails.
         throw new InvalidConfigPropertyException(
-          String.format(
-            "Error handling regex '%s' is not valid. %s", regex, e.getMessage()), PROPERTY_HTTP_ERROR_HANDLING);
+          String.format("Error handling regex '%s' is not valid. %s", regex, e.getMessage()),
+                HttpConstants.PROPERTY_HTTP_ERROR_HANDLING
+        );
       }
     }
     return results;
@@ -685,18 +651,18 @@ public List<String> getTransportProtocolsList() {
 
   public void validate() {
     // Validate URL
-    if (!containsMacro(PROPERTY_URL)) {
+    if (!containsMacro(HttpConstants.PROPERTY_URL)) {
       try {
         // replace with placeholder with anything just during pagination
         new URI(getUrl().replaceAll(PAGINATION_INDEX_PLACEHOLDER_REGEX, "0"));
       } catch (URISyntaxException e) {
         throw new InvalidConfigPropertyException(
-          String.format("URL value is not valid: '%s'", getUrl()), e, PROPERTY_URL);
+          String.format("URL value is not valid: '%s'", getUrl()), e, HttpConstants.PROPERTY_URL);
       }
     }
 
     // Validate HTTP Error Handling Map
-    if (!containsMacro(PROPERTY_HTTP_ERROR_HANDLING)) {
+    if (!containsMacro(HttpConstants.PROPERTY_HTTP_ERROR_HANDLING)) {
       List<HttpErrorHandlerEntity> httpErrorsHandlingEntries = getHttpErrorHandlingEntries();
       boolean supportsSkippingPages = PaginationIteratorFactory
         .createInstance(this, null).supportsSkippingPages();
@@ -708,7 +674,8 @@ public void validate() {
             postRetryStrategy.equals(ErrorHandling.SKIP)) {
             throw new InvalidConfigPropertyException(
               String.format("Error handling strategy '%s' is not support in combination with pagination type",
-                            httpErrorsHandlingEntry.getStrategy(), getPaginationType()), PROPERTY_HTTP_ERROR_HANDLING);
+                            httpErrorsHandlingEntry.getStrategy(), getPaginationType()
+              ), HttpConstants.PROPERTY_HTTP_ERROR_HANDLING);
           }
         }
       }
@@ -716,7 +683,7 @@ public void validate() {
 
 
     // Validate Linear Retry Interval
-    if (!containsMacro(PROPERTY_RETRY_POLICY) && getRetryPolicy() == RetryPolicy.LINEAR) {
+    if (!containsMacro(HttpConstants.PROPERTY_RETRY_POLICY) && getRetryPolicy() == RetryPolicy.LINEAR) {
       assertIsSet(getLinearRetryInterval(), PROPERTY_LINEAR_RETRY_INTERVAL, "retry policy is linear");
     }
 
@@ -758,7 +725,7 @@ public void validate() {
             throw new InvalidConfigPropertyException(
               String.format("Url '%s' must contain '%s' placeholder when pagination type is '%s'", getUrl(),
                             PAGINATION_INDEX_PLACEHOLDER, getPaginationType()),
-              PROPERTY_URL);
+                    HttpConstants.PROPERTY_URL);
           }
           break;
         case CUSTOM:
@@ -798,18 +765,21 @@ PAGINATION_INDEX_PLACEHOLDER, getPaginationType()),
     }
 
     // Validate OAuth2 properties
-    if (!containsMacro(PROPERTY_OAUTH2_ENABLED) && this.getOauth2Enabled()) {
+    if (!containsMacro(HttpConstants.PROPERTY_OAUTH2_ENABLED) && this.getOauth2Enabled()) {
       String reasonOauth2 = "OAuth2 is enabled";
-      assertIsSet(getAuthUrl(), PROPERTY_AUTH_URL, reasonOauth2);
-      assertIsSet(getTokenUrl(), PROPERTY_TOKEN_URL, reasonOauth2);
-      assertIsSet(getClientId(), PROPERTY_CLIENT_ID, reasonOauth2);
-      assertIsSet(getClientSecret(), PROPERTY_CLIENT_SECRET, reasonOauth2);
-      assertIsSet(getRefreshToken(), PROPERTY_REFRESH_TOKEN, reasonOauth2);
+      assertIsSet(getAuthUrl(), HttpConstants.PROPERTY_AUTH_URL, reasonOauth2);
+      assertIsSet(getTokenUrl(), HttpConstants.PROPERTY_TOKEN_URL, reasonOauth2);
+      assertIsSet(getClientId(), HttpConstants.PROPERTY_CLIENT_ID, reasonOauth2);
+      assertIsSet(getClientSecret(), HttpConstants.PROPERTY_CLIENT_SECRET, reasonOauth2);
+      assertIsSet(getRefreshToken(), HttpConstants.PROPERTY_REFRESH_TOKEN, reasonOauth2);
     }
 
-    if (!containsMacro(PROPERTY_VERIFY_HTTPS) && !getVerifyHttps()) {
-      assertIsNotSet(getTrustStoreFile(), PROPERTY_TRUSTSTORE_FILE,
-                     String.format("trustore settings are ignored due to disabled %s", PROPERTY_VERIFY_HTTPS));
+    if (!containsMacro(HttpConstants.PROPERTY_VERIFY_HTTPS) && !getVerifyHttps()) {
+      assertIsNotSet(
+              getTrustStoreFile(),
+              HttpConstants.PROPERTY_TRUSTSTORE_FILE,
+              String.format("trustore settings are ignored due to disabled %s", HttpConstants.PROPERTY_VERIFY_HTTPS)
+      );
     }
   }
 
diff --git a/src/main/java/io/cdap/plugin/http/common/error/HttpErrorHandler.java b/src/main/java/io/cdap/plugin/http/common/error/HttpErrorHandler.java
index 3c37f175..172d9479 100644
--- a/src/main/java/io/cdap/plugin/http/common/error/HttpErrorHandler.java
+++ b/src/main/java/io/cdap/plugin/http/common/error/HttpErrorHandler.java
@@ -15,7 +15,6 @@
  */
 package io.cdap.plugin.http.common.error;
 
-import io.cdap.plugin.http.common.BaseHttpSourceConfig;
 import io.cdap.plugin.http.common.http.IHttpConfig;
 
 import org.slf4j.Logger;
@@ -31,23 +30,31 @@ public class HttpErrorHandler {
   private static final Logger LOG = LoggerFactory.getLogger(HttpErrorHandler.class);
 
   private List<HttpErrorHandlerEntity> httpErrorsHandlingEntries;
+  private boolean showWarnings = true;
 
   public HttpErrorHandler(IHttpConfig config) {
     this.httpErrorsHandlingEntries = config.getHttpErrorHandlingEntries();
   }
 
+  public HttpErrorHandler(IHttpConfig config, boolean showWarnings) {
+    this.httpErrorsHandlingEntries = config.getHttpErrorHandlingEntries();
+    this.showWarnings = showWarnings;
+  }
+
   public RetryableErrorHandling getErrorHandlingStrategy(int httpCode) {
     String httpCodeString = Integer.toString(httpCode);
 
-    for (HttpErrorHandlerEntity httpErrorsHandlingEntry : httpErrorsHandlingEntries) {
+    for (HttpErrorHandlerEntity httpErrorsHandlingEntry: httpErrorsHandlingEntries) {
       Matcher matcher = httpErrorsHandlingEntry.getPattern().matcher(httpCodeString);
       if (matcher.matches()) {
         return httpErrorsHandlingEntry.getStrategy();
       }
     }
 
-    LOG.warn(String.format("No error handling strategy defined for HTTP status code '%d'. " +
-                             "Please correct httpErrorsHandling.", httpCode));
+    if (showWarnings) {
+      LOG.warn(String.format("No error handling strategy defined for HTTP status code '%d'. " +
+              "Please correct httpErrorsHandling.", httpCode));
+    }
     return RetryableErrorHandling.FAIL;
   }
 }
diff --git a/src/main/java/io/cdap/plugin/http/common/http/HttpClient.java b/src/main/java/io/cdap/plugin/http/common/http/HttpClient.java
index 92597764..aa6b151d 100644
--- a/src/main/java/io/cdap/plugin/http/common/http/HttpClient.java
+++ b/src/main/java/io/cdap/plugin/http/common/http/HttpClient.java
@@ -96,29 +96,31 @@ private CloseableHttpClient createHttpClient() throws IOException {
     httpClientBuilder.setSSLSocketFactory(new SSLConnectionSocketFactoryCreator(config).create());
 
     // set timeouts
-    Long connectTimeoutMillis = TimeUnit.SECONDS.toMillis(config.getConnectTimeout());
-    Long readTimeoutMillis = TimeUnit.SECONDS.toMillis(config.getReadTimeout());
+    int connectTimeoutMillis = (int) TimeUnit.SECONDS.toMillis(config.getConnectTimeout());
+    int readTimeoutMillis = (int) TimeUnit.SECONDS.toMillis(config.getReadTimeout());
     RequestConfig.Builder requestBuilder = RequestConfig.custom();
-    requestBuilder.setSocketTimeout(readTimeoutMillis.intValue());
-    requestBuilder.setConnectTimeout(connectTimeoutMillis.intValue());
-    requestBuilder.setConnectionRequestTimeout(connectTimeoutMillis.intValue());
+    requestBuilder.setSocketTimeout(readTimeoutMillis);
+    requestBuilder.setConnectTimeout(connectTimeoutMillis);
+    requestBuilder.setConnectionRequestTimeout(connectTimeoutMillis);
     httpClientBuilder.setDefaultRequestConfig(requestBuilder.build());
 
     // basic auth
     CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
     if (!Strings.isNullOrEmpty(config.getUsername()) && !Strings.isNullOrEmpty(config.getPassword())) {
-      AuthScope authScope = new AuthScope(HttpHost.create(config.getUrl()));
-      credentialsProvider.setCredentials(authScope,
-                                         new UsernamePasswordCredentials(config.getUsername(), config.getPassword()));
+      credentialsProvider.setCredentials(
+        new AuthScope(HttpHost.create(config.getUrl())),
+        new UsernamePasswordCredentials(config.getUsername(), config.getPassword())
+      );
     }
 
     // proxy and proxy auth
     if (!Strings.isNullOrEmpty(config.getProxyUrl())) {
       HttpHost proxyHost = HttpHost.create(config.getProxyUrl());
       if (!Strings.isNullOrEmpty(config.getProxyUsername()) && !Strings.isNullOrEmpty(config.getProxyPassword())) {
-        credentialsProvider.setCredentials(new AuthScope(proxyHost),
-                                           new UsernamePasswordCredentials(
-                                             config.getProxyUsername(), config.getProxyPassword()));
+        credentialsProvider.setCredentials(
+          new AuthScope(proxyHost),
+          new UsernamePasswordCredentials(config.getProxyUsername(), config.getProxyPassword())
+        );
       }
       httpClientBuilder.setProxy(proxyHost);
     }
diff --git a/src/main/java/io/cdap/plugin/http/common/http/IHttpConfig.java b/src/main/java/io/cdap/plugin/http/common/http/IHttpConfig.java
index 50dfb021..09d93759 100644
--- a/src/main/java/io/cdap/plugin/http/common/http/IHttpConfig.java
+++ b/src/main/java/io/cdap/plugin/http/common/http/IHttpConfig.java
@@ -23,7 +23,7 @@
 import javax.annotation.Nullable;
 
 /**
- * Interface for the HTTP Plugin Config
+ * Interface for the HTTP Plugins Config
  */
 public interface IHttpConfig {
 
diff --git a/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java b/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java
index 481294cf..753d61b2 100644
--- a/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java
+++ b/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java
@@ -38,6 +38,7 @@
 import io.cdap.cdap.test.TestConfiguration;
 import io.cdap.cdap.test.WorkflowManager;
 import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpConstants;
 import io.cdap.plugin.http.source.batch.HttpBatchSource;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -79,26 +80,26 @@ public static void setupTestClass() throws Exception {
     // this will make our plugins available.
     addPluginArtifact(NamespaceId.DEFAULT.artifact("example-plugins", "1.0.0"),
                       parentArtifact,
-                      HttpBatchSource.class);
+                      HttpBatchSource.class);qqq
   }
 
   public List<StructuredRecord> getPipelineResults(Map<String, String> sourceProperties) throws Exception {
     Map<String, String> allProperties = new ImmutableMap.Builder<String, String>()
       .put("referenceName", name.getMethodName())
-      .put(BaseHttpSourceConfig.PROPERTY_HTTP_METHOD, "GET")
-      .put(BaseHttpSourceConfig.PROPERTY_OAUTH2_ENABLED, "false")
-      .put(BaseHttpSourceConfig.PROPERTY_HTTP_ERROR_HANDLING, "2..:Success,.*:Fail")
-      .put(BaseHttpSourceConfig.PROPERTY_ERROR_HANDLING, "stopOnError")
-      .put(BaseHttpSourceConfig.PROPERTY_RETRY_POLICY, "linear")
+      .put(HttpConstants.PROPERTY_HTTP_METHOD, "GET")
+      .put(HttpConstants.PROPERTY_OAUTH2_ENABLED, "false")
+      .put(HttpConstants.PROPERTY_HTTP_ERROR_HANDLING, "2..:Success,.*:Fail")
+      .put(HttpConstants.PROPERTY_ERROR_HANDLING, "stopOnError")
+      .put(HttpConstants.PROPERTY_RETRY_POLICY, "linear")
       .put(BaseHttpSourceConfig.PROPERTY_MAX_RETRY_DURATION, "10")
       .put(BaseHttpSourceConfig.PROPERTY_LINEAR_RETRY_INTERVAL, "1")
       .put(BaseHttpSourceConfig.PROPERTY_WAIT_TIME_BETWEEN_PAGES, "0")
-      .put(BaseHttpSourceConfig.PROPERTY_CONNECT_TIMEOUT, "60")
-      .put(BaseHttpSourceConfig.PROPERTY_READ_TIMEOUT, "120")
-      .put(BaseHttpSourceConfig.PROPERTY_VERIFY_HTTPS, "true")
-      .put(BaseHttpSourceConfig.PROPERTY_KEYSTORE_TYPE, "Java KeyStore (JKS)")
-      .put(BaseHttpSourceConfig.PROPERTY_TRUSTSTORE_TYPE, "Java KeyStore (JKS)")
-      .put(BaseHttpSourceConfig.PROPERTY_TRANSPORT_PROTOCOLS, "TLSv1.2")
+      .put(HttpConstants.PROPERTY_CONNECT_TIMEOUT, "60")
+      .put(HttpConstants.PROPERTY_READ_TIMEOUT, "120")
+      .put(HttpConstants.PROPERTY_VERIFY_HTTPS, "true")
+      .put(HttpConstants.PROPERTY_KEYSTORE_TYPE, "Java KeyStore (JKS)")
+      .put(HttpConstants.PROPERTY_TRUSTSTORE_TYPE, "Java KeyStore (JKS)")
+      .put(HttpConstants.PROPERTY_TRANSPORT_PROTOCOLS, "TLSv1.2")
       .putAll(sourceProperties)
       .build();
 
diff --git a/src/test/java/io/cdap/plugin/http/etl/HttpSourceETLTest.java b/src/test/java/io/cdap/plugin/http/etl/HttpSourceETLTest.java
index 74123c74..5f525754 100644
--- a/src/test/java/io/cdap/plugin/http/etl/HttpSourceETLTest.java
+++ b/src/test/java/io/cdap/plugin/http/etl/HttpSourceETLTest.java
@@ -23,6 +23,7 @@
 import io.cdap.cdap.etl.mock.test.HydratorTestBase;
 import io.cdap.cdap.test.TestConfiguration;
 import io.cdap.plugin.http.common.BaseHttpSourceConfig;
+import io.cdap.plugin.http.common.http.HttpConstants;
 import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -70,7 +71,7 @@ public void testIncrementAnIndex() throws Exception {
 
     );
     Map<String, String> properties = new ImmutableMap.Builder<String, String>()
-      .put(BaseHttpSourceConfig.PROPERTY_URL,
+      .put(HttpConstants.PROPERTY_URL,
            getServerAddress() + "/rest/api/2/search?maxResults=2&startAt={pagination.index}")
            //"https://issues.cask.co/rest/api/2/search?maxResults=2&startAt={pagination.index}")
       .put(BaseHttpSourceConfig.PROPERTY_FORMAT, "json")
@@ -79,7 +80,7 @@ public void testIncrementAnIndex() throws Exception {
            "type:/fields/issuetype/name,description:/fields/description," +
              "projectCategory:/fields/project/projectCategory/name,isSubtask:/fields/issuetype/subtask," +
              "fixVersions:/fields/fixVersions")
-      .put(BaseHttpSourceConfig.PROPERTY_SCHEMA, schema.toString())
+      .put(HttpConstants.PROPERTY_SCHEMA, schema.toString())
       .put(BaseHttpSourceConfig.PROPERTY_PAGINATION_TYPE, "Increment an index")
       .put(BaseHttpSourceConfig.PROPERTY_START_INDEX, "0")
       .put(BaseHttpSourceConfig.PROPERTY_INDEX_INCREMENT, "2")
@@ -124,14 +125,14 @@ public void testIncrementAnIndexXml() throws Exception {
     // https://services.odata.org
     // /V3/Northwind/Northwind.svc/Customers?$inlinecount=allpages&$top=5&$skip={pagination.index}
     Map<String, String> properties = new ImmutableMap.Builder<String, String>()
-      .put(BaseHttpSourceConfig.PROPERTY_URL, getServerAddress() + "/V3/Northwind/Northwind.svc" +
+      .put(HttpConstants.PROPERTY_URL, getServerAddress() + "/V3/Northwind/Northwind.svc" +
         "/Customers?$inlinecount=allpages&$top=5&$skip={pagination.index}")
       .put(BaseHttpSourceConfig.PROPERTY_FORMAT, "xml")
       .put(BaseHttpSourceConfig.PROPERTY_RESULT_PATH, "/feed/entry")
       .put(BaseHttpSourceConfig.PROPERTY_FIELDS_MAPPING,
            "companyName:content/properties/CompanyName,postalCode:content/properties/PostalCode," +
              "country:content/properties/Country,phone:content/properties/Phone,fax:content/properties/Fax/text()")
-      .put(BaseHttpSourceConfig.PROPERTY_SCHEMA, schema.toString())
+      .put(HttpConstants.PROPERTY_SCHEMA, schema.toString())
       .put(BaseHttpSourceConfig.PROPERTY_PAGINATION_TYPE, "Increment an index")
       .put(BaseHttpSourceConfig.PROPERTY_START_INDEX, "0")
       .put(BaseHttpSourceConfig.PROPERTY_INDEX_INCREMENT, "20")
@@ -177,12 +178,12 @@ public void testLinkInResponseBody() throws Exception {
                                                     Schema.of(Schema.Type.STRING))
     );
     Map<String, String> properties = new ImmutableMap.Builder<String, String>()
-      .put(BaseHttpSourceConfig.PROPERTY_URL,
+      .put(HttpConstants.PROPERTY_URL,
            // http://confluence.atlassian.com/rest/api/space/ADMINJIRASERVER0710/content/page?limit=100&start=0
            getServerAddress() + "/rest/api/space/ADMINJIRASERVER0710/content/page?limit=2&start=0")
       .put(BaseHttpSourceConfig.PROPERTY_FORMAT, "json")
       .put(BaseHttpSourceConfig.PROPERTY_RESULT_PATH, "/results")
-      .put(BaseHttpSourceConfig.PROPERTY_SCHEMA, schema.toString())
+      .put(HttpConstants.PROPERTY_SCHEMA, schema.toString())
       .put(BaseHttpSourceConfig.PROPERTY_PAGINATION_TYPE, "Link in response body")
       .put(BaseHttpSourceConfig.PROPERTY_NEXT_PAGE_FIELD_PATH, "/_links/next")
       .build();
@@ -222,13 +223,13 @@ public void testLinkInResponseHeader() throws Exception {
                                                     ))
     );
     Map<String, String> properties = new ImmutableMap.Builder<String, String>()
-      .put(BaseHttpSourceConfig.PROPERTY_URL,
+      .put(HttpConstants.PROPERTY_URL,
            //"https://api.github.com/search/code?q=Salesforce+user:data-integrations")
            getServerAddress() + "/search/code?q=Salesforce+user:data-integrations&per_page=2")
       .put(BaseHttpSourceConfig.PROPERTY_FORMAT, "json")
       .put(BaseHttpSourceConfig.PROPERTY_RESULT_PATH, "/items")
       .put(BaseHttpSourceConfig.PROPERTY_FIELDS_MAPPING, "path:/path,score:/score,repository:/repository")
-      .put(BaseHttpSourceConfig.PROPERTY_SCHEMA, schema.toString())
+      .put(HttpConstants.PROPERTY_SCHEMA, schema.toString())
       .put(BaseHttpSourceConfig.PROPERTY_PAGINATION_TYPE, "Link in response header")
       .build();
 
@@ -282,11 +283,11 @@ public void testNonePagination() throws Exception {
 
     Map<String, String> properties = new ImmutableMap.Builder<String, String>()
       // https://searchcode.com/api/codesearch_I/?q=cdap
-      .put(BaseHttpSourceConfig.PROPERTY_URL, getServerAddress() + "/api/codesearch_I/?q=cdap")
+      .put(HttpConstants.PROPERTY_URL, getServerAddress() + "/api/codesearch_I/?q=cdap")
       .put(BaseHttpSourceConfig.PROPERTY_FORMAT, "json")
       .put(BaseHttpSourceConfig.PROPERTY_RESULT_PATH, "/results")
       .put(BaseHttpSourceConfig.PROPERTY_FIELDS_MAPPING, "repo:repo,language:/language,file:/filename,url:/url")
-      .put(BaseHttpSourceConfig.PROPERTY_SCHEMA, schema.toString())
+      .put(HttpConstants.PROPERTY_SCHEMA, schema.toString())
       .put(BaseHttpSourceConfig.PROPERTY_PAGINATION_TYPE, "None")
       .build();
 
@@ -307,9 +308,9 @@ public void testNonePaginationBlob() throws Exception {
     );
 
     Map<String, String> properties = new ImmutableMap.Builder<String, String>()
-      .put(BaseHttpSourceConfig.PROPERTY_URL, getServerAddress() + "/blob")
+      .put(HttpConstants.PROPERTY_URL, getServerAddress() + "/blob")
       .put(BaseHttpSourceConfig.PROPERTY_FORMAT, "blob")
-      .put(BaseHttpSourceConfig.PROPERTY_SCHEMA, schema.toString())
+      .put(HttpConstants.PROPERTY_SCHEMA, schema.toString())
       .put(BaseHttpSourceConfig.PROPERTY_PAGINATION_TYPE, "None")
       .build();
 
@@ -347,9 +348,9 @@ public void testNonePaginationCSV() throws Exception {
 
     Map<String, String> properties = new ImmutableMap.Builder<String, String>()
       // https://s3.theeventscalendar.com/uploads/2014/09/test-data-venues11.csv
-      .put(BaseHttpSourceConfig.PROPERTY_URL, getServerAddress() + "/uploads/2014/09/test-data-venues11.csv")
+      .put(HttpConstants.PROPERTY_URL, getServerAddress() + "/uploads/2014/09/test-data-venues11.csv")
       .put(BaseHttpSourceConfig.PROPERTY_FORMAT, "csv")
-      .put(BaseHttpSourceConfig.PROPERTY_SCHEMA, schema.toString())
+      .put(HttpConstants.PROPERTY_SCHEMA, schema.toString())
       .put(BaseHttpSourceConfig.PROPERTY_PAGINATION_TYPE, "None")
       .build();
 
@@ -370,9 +371,9 @@ public void testNonePaginationText() throws Exception {
     );
     //"http://www.columbia.edu/~fdc/sample.html")
     Map<String, String> properties = new ImmutableMap.Builder<String, String>()
-      .put(BaseHttpSourceConfig.PROPERTY_URL, getServerAddress() + "/sample.html")
+      .put(HttpConstants.PROPERTY_URL, getServerAddress() + "/sample.html")
       .put(BaseHttpSourceConfig.PROPERTY_FORMAT, "text")
-      .put(BaseHttpSourceConfig.PROPERTY_SCHEMA, schema.toString())
+      .put(HttpConstants.PROPERTY_SCHEMA, schema.toString())
       .put(BaseHttpSourceConfig.PROPERTY_PAGINATION_TYPE, "None")
       .build();
 
@@ -395,11 +396,11 @@ public void testNonePaginationXml() throws Exception {
 
     Map<String, String> properties = new ImmutableMap.Builder<String, String>()
       // https://www.w3.org/2003/05/soap-envelope/
-      .put(BaseHttpSourceConfig.PROPERTY_URL, getServerAddress() + "/2003/05/soap-envelope/")
+      .put(HttpConstants.PROPERTY_URL, getServerAddress() + "/2003/05/soap-envelope/")
       .put(BaseHttpSourceConfig.PROPERTY_FORMAT, "xml")
       .put(BaseHttpSourceConfig.PROPERTY_RESULT_PATH, "/schema/complexType[@name='Fault']/sequence/element")
       .put(BaseHttpSourceConfig.PROPERTY_FIELDS_MAPPING, "name:@name,type:@type")
-      .put(BaseHttpSourceConfig.PROPERTY_SCHEMA, schema.toString())
+      .put(HttpConstants.PROPERTY_SCHEMA, schema.toString())
       .put(BaseHttpSourceConfig.PROPERTY_PAGINATION_TYPE, "None")
       .build();
 
@@ -449,11 +450,11 @@ public void testPaginationCustom() throws Exception {
 
     Map<String, String> properties = new ImmutableMap.Builder<String, String>()
       // https://searchcode.com/api/codesearch_I/?q=cdap&per_page=2
-      .put(BaseHttpSourceConfig.PROPERTY_URL, getServerAddress() + "/api/codesearch_I/?q=cdap&per_page=2")
+      .put(HttpConstants.PROPERTY_URL, getServerAddress() + "/api/codesearch_I/?q=cdap&per_page=2")
       .put(BaseHttpSourceConfig.PROPERTY_FORMAT, "json")
       .put(BaseHttpSourceConfig.PROPERTY_RESULT_PATH, "/results")
       .put(BaseHttpSourceConfig.PROPERTY_FIELDS_MAPPING, "repo:repo,language:/language,file:/filename,url:/url")
-      .put(BaseHttpSourceConfig.PROPERTY_SCHEMA, schema.toString())
+      .put(HttpConstants.PROPERTY_SCHEMA, schema.toString())
       .put(BaseHttpSourceConfig.PROPERTY_PAGINATION_TYPE, "Custom")
       .put(BaseHttpSourceConfig.PROPERTY_CUSTOM_PAGINATION_CODE, paginationCode)
       .build();
@@ -485,20 +486,20 @@ public void testPaginationCustom() throws Exception {
   protected Map<String, String> getProperties(Map<String, String> sourceProperties) {
     return new ImmutableMap.Builder<String, String>()
       .put("referenceName", testName.getMethodName())
-      .put(BaseHttpSourceConfig.PROPERTY_HTTP_METHOD, "GET")
-      .put(BaseHttpSourceConfig.PROPERTY_OAUTH2_ENABLED, "false")
-      .put(BaseHttpSourceConfig.PROPERTY_HTTP_ERROR_HANDLING, "2..:Success,.*:Fail")
-      .put(BaseHttpSourceConfig.PROPERTY_ERROR_HANDLING, "stopOnError")
-      .put(BaseHttpSourceConfig.PROPERTY_RETRY_POLICY, "linear")
+      .put(HttpConstants.PROPERTY_HTTP_METHOD, "GET")
+      .put(HttpConstants.PROPERTY_OAUTH2_ENABLED, "false")
+      .put(HttpConstants.PROPERTY_HTTP_ERROR_HANDLING, "2..:Success,.*:Fail")
+      .put(HttpConstants.PROPERTY_ERROR_HANDLING, "stopOnError")
+      .put(HttpConstants.PROPERTY_RETRY_POLICY, "linear")
       .put(BaseHttpSourceConfig.PROPERTY_MAX_RETRY_DURATION, "10")
       .put(BaseHttpSourceConfig.PROPERTY_LINEAR_RETRY_INTERVAL, "1")
       .put(BaseHttpSourceConfig.PROPERTY_WAIT_TIME_BETWEEN_PAGES, "0")
-      .put(BaseHttpSourceConfig.PROPERTY_CONNECT_TIMEOUT, "60")
-      .put(BaseHttpSourceConfig.PROPERTY_READ_TIMEOUT, "120")
-      .put(BaseHttpSourceConfig.PROPERTY_VERIFY_HTTPS, "true")
-      .put(BaseHttpSourceConfig.PROPERTY_KEYSTORE_TYPE, "Java KeyStore (JKS)")
-      .put(BaseHttpSourceConfig.PROPERTY_TRUSTSTORE_TYPE, "Java KeyStore (JKS)")
-      .put(BaseHttpSourceConfig.PROPERTY_TRANSPORT_PROTOCOLS, "TLSv1.2")
+      .put(HttpConstants.PROPERTY_CONNECT_TIMEOUT, "60")
+      .put(HttpConstants.PROPERTY_READ_TIMEOUT, "120")
+      .put(HttpConstants.PROPERTY_VERIFY_HTTPS, "true")
+      .put(HttpConstants.PROPERTY_KEYSTORE_TYPE, "Java KeyStore (JKS)")
+      .put(HttpConstants.PROPERTY_TRUSTSTORE_TYPE, "Java KeyStore (JKS)")
+      .put(HttpConstants.PROPERTY_TRANSPORT_PROTOCOLS, "TLSv1.2")
       .putAll(sourceProperties)
       .build();
   }
diff --git a/widgets/HTTP-action.json b/widgets/HTTP-action.json
index d787b374..4f2ab93c 100644
--- a/widgets/HTTP-action.json
+++ b/widgets/HTTP-action.json
@@ -6,11 +6,6 @@
     {
       "label": "General",
       "properties": [
-        {
-          "widget-type": "hidden",
-          "name": "alwaysHidden",
-          "default": "true"
-        },
         {
           "widget-type": "textbox",
           "label": "URL",
@@ -147,11 +142,7 @@
             "showDelimiter": "false",
             "dropdownOptions": [
               "Success",
-              "Fail",
-              "Skip",
-              "Retry and fail",
-              "Retry and skip",
-              "Retry and send to error"
+              "Fail"
             ],
             "key-placeholder": "HTTP Status Code Regex"
           }
@@ -167,14 +158,6 @@
               {
                 "id": "stopOnError",
                 "label": "Stop on error"
-              },
-              {
-                "id": "sendToError",
-                "label": "Send to error"
-              },
-              {
-                "id": "skipOnError",
-                "label": "Skip on error"
               }
             ]
           }
@@ -337,24 +320,6 @@
         }
       ]
     },
-    {
-      "name": "Hide properties",
-      "condition": {
-        "property": "alwaysHidden",
-        "operator": "equals to",
-        "value": "false"
-      },
-      "show": [
-        {
-          "name": "httpErrorsHandling",
-          "type": "property"
-        },
-        {
-          "name": "errorHandling",
-          "type": "property"
-        }
-      ]
-    },
     {
       "name": "OAuth 2 enabled",
       "condition": {
diff --git a/widgets/HTTP-batchsource.json b/widgets/HTTP-batchsource.json
index fd612166..373101ec 100644
--- a/widgets/HTTP-batchsource.json
+++ b/widgets/HTTP-batchsource.json
@@ -508,7 +508,7 @@
       "name": "Proxy authentication",
       "condition": {
         "property": "proxyUrl",
-        "operator": "exists",
+        "operator": "exists"
       },
       "show": [
         {

From 05e41145cd10ada3da4e9012760be9e31d187aa9 Mon Sep 17 00:00:00 2001
From: dgrinenko <dgrinenko@cybervisiontech.com>
Date: Wed, 12 Jan 2022 13:02:28 +0200
Subject: [PATCH 5/5] Remove type

---
 .../io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java b/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java
index 753d61b2..6c27b093 100644
--- a/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java
+++ b/src/test/java/io/cdap/plugin/http/etl/BaseHttpBatchSourceETLTest.java
@@ -80,7 +80,7 @@ public static void setupTestClass() throws Exception {
     // this will make our plugins available.
     addPluginArtifact(NamespaceId.DEFAULT.artifact("example-plugins", "1.0.0"),
                       parentArtifact,
-                      HttpBatchSource.class);qqq
+                      HttpBatchSource.class);
   }
 
   public List<StructuredRecord> getPipelineResults(Map<String, String> sourceProperties) throws Exception {