added validation

Author: dgrinenko

.gitignore

@@ -22,6 +22,7 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+*.xml
 # project files
 *.iml
 .idea

pom.xml

@@ -76,8 +76,28 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.4</version>
+            <scope>compile</scope>
+        </dependency>
         <!-- should match the gson version used by cdap-->
         <dependency>
             <groupId>com.google.code.gson</groupId>

src/main/java/io/cdap/plugin/sendgrid/common/SendGridClient.java

@@ -18,6 +18,7 @@
 import com.google.common.base.Strings;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
 import com.sendgrid.Method;
 import com.sendgrid.Request;
 import com.sendgrid.Response;
@@ -26,13 +27,14 @@
 import io.cdap.plugin.sendgrid.common.helpers.ObjectInfo;
 import io.cdap.plugin.sendgrid.common.objects.BasicResult;
 import io.cdap.plugin.sendgrid.common.objects.SendGridAuthType;
-import io.cdap.plugin.sendgrid.source.batch.SendGridBatchSourceConfig;
+import io.cdap.plugin.sendgrid.source.batch.SendGridBatchConfig;
 
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Base64;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -43,6 +45,7 @@
  * SendGrid Client
  */
 public class SendGridClient {
+  private static final String CONNECTION_CHECK_ENDPOINT = "alerts";
 
   /**
    * Extended version of the original SendGrid API wrapper with added support of basic auth
@@ -77,7 +80,7 @@ private SendGridClient() {
     gson = new GsonBuilder().create();
   }
 
-  public SendGridClient(SendGridBatchSourceConfig config) {
+  public SendGridClient(SendGridBatchConfig config) {
     this();
     if (config.getAuthType() == SendGridAuthType.API) {
       sendGrid = new SendGridAPIClient(config.getSendGridApiKey());
@@ -123,12 +126,37 @@ private String makeApiRequest(Method method, String endpoint, @Nullable Map<Stri
     try {
       response = sendGrid.api(request);
     } catch (IOException e) {
-      throw new IOException(String.format("Request to SendGrid API \"%s\"", endpoint), e);
+      String serverMessage = String.format("Request to SendGrid API \"%s\"", endpoint);
+      // Parse error response from the server
+      if (e.getMessage().contains("Body:")) {
+        String[] messages = e.getMessage().split("Body:");
+        HashMap<String, List<HashMap<String, String>>> errors = gson.fromJson(
+          messages[1],
+          new TypeToken<HashMap<String, List<HashMap<String, String>>>>() { }.getType()
+        );
+        if (errors.containsKey("errors")) {
+          String description = errors.get("errors").stream()
+            .filter(x -> x.containsKey("message"))
+            .map(x -> x.get("message"))
+            .collect(Collectors.joining(";"));
+
+          serverMessage = String.format("%s, API response: %s", messages[0], description);
+        }
+      }
+      throw new IOException(serverMessage, e);
     }
 
     return response.getBody();
   }
 
+  /**
+   * Checks connection to the service by testing API endpoint, in case
+   * of exception would be generated {@link IOException}
+   */
+  public void checkConnection() throws IOException {
+      makeApiRequest(Method.GET, CONNECTION_CHECK_ENDPOINT, null);
+  }
+
   /**
    * Verify all incoming arguments for the query object
    *

src/main/java/io/cdap/plugin/sendgrid/common/config/BaseSourceConfig.java renamed to src/main/java/io/cdap/plugin/sendgrid/common/config/BaseConfig.java

@@ -39,7 +39,7 @@
 /**
  * Provides all required configuration for reading SendGrid information
  */
-public class BaseSourceConfig extends ReferencePluginConfig {
+public class BaseConfig extends ReferencePluginConfig {
   public static final String PROPERTY_AUTH_TYPE = "authType";
   public static final String PROPERTY_SENDGRID_API_KEY = "sendGridApiKey";
   public static final String PROPERTY_AUTH_USERNAME = "username";
@@ -52,8 +52,8 @@ public class BaseSourceConfig extends ReferencePluginConfig {
 
   public static final String PROPERTY_DATA_SOURCE_FIELDS = "dataSourceFields";
   public static final String PROPERTY_STAT_CATEGORIES = "statCategories";
-  public static final String PROPERTY_START_DATE = "startDate";
-  public static final String PROPERTY_END_DATE = "endDate";
+  public static final String PROPERTY_START_DATE = "start_date";
+  public static final String PROPERTY_END_DATE = "end_date";
 
   @Name(PROPERTY_AUTH_TYPE)
   @Description("The way, how user would like to be authenticated to the SendGrid account")
@@ -134,10 +134,17 @@ public class BaseSourceConfig extends ReferencePluginConfig {
    *
    * @param referenceName uniquely identify source/sink for lineage, annotating metadata, etc.
    */
-  public BaseSourceConfig(String referenceName) {
+  public BaseConfig(String referenceName) {
     super(referenceName);
   }
 
+  /**
+   * Validate configuration for the issues
+   */
+  protected void validate(FailureCollector failureCollector) {
+     new BaseConfigValidator(failureCollector, this).validate();
+  }
+
   /**
    * Fetches all fields selected by the user
    */
@@ -223,10 +230,6 @@ public Map<String, String> getRequestArguments() {
     return builder.build();
   }
 
-  public void validate(FailureCollector failureCollector) {
-
-  }
-
   /**
    * Client authentication way
    */
@@ -271,4 +274,11 @@ public String getStartDate() {
   public String getEndDate() {
     return endDate;
   }
+
+  public List<String> getDataSourceTypes() {
+    if (!Strings.isNullOrEmpty(dataSourceTypes)) {
+      return Arrays.asList(dataSourceTypes.split(","));
+    }
+    return Collections.emptyList();
+  }
 }