Merge branch 'apikeys'

Author: eddiezane

README.md

@@ -35,7 +35,7 @@ public class SendGridExample {
 Compile and run this example with
 
 ```bash
-$ javac -classpath sendgrid-1.2.1-jar.jar:. SendGridExample.java && java -classpath sendgrid-1.2.1-jar.jar:. SendGridExample
+$ javac -classpath sendgrid-2.2.0-jar.jar:. SendGridExample.java && java -classpath sendgrid-2.2.0-jar.jar:. SendGridExample
 ```
 
 ## Installation
@@ -50,7 +50,7 @@ Add the following to your build.gradle file in the root of your project.
 ...
 dependencies {
   ...
-  compile 'com.sendgrid:sendgrid-java:2.0.0'
+  compile 'com.sendgrid:sendgrid-java:2.2.0'
 }
 
 repositories {
@@ -83,11 +83,13 @@ import com.sendgrid.*;
 
 ## Usage
 
-To begin using this library, initialize the SendGrid object with your SendGrid credentials.
+To begin using this library, initialize the SendGrid object with your SendGrid credentials OR a SendGrid API Key. API Key is the preferred method. API Keys are in beta. To configure API keys, visit https://sendgrid.com/beta/settings/api_keys.
 
 ```java
 import com.sendgrid.SendGrid;
 SendGrid sendgrid = new SendGrid("sendgrid_username", "sendgrid_password");
+// or
+SendGrid sendgrid = new SendGrid("sendgrid_api_key");
 ```
 
 Add your message details.

build.gradle

@@ -17,7 +17,7 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 group         = 'com.sendgrid'
-version       = '2.1.1'
+version       = '2.2.0'
 ext.packaging = 'jar'
 
 allprojects {

src/main/java/com/sendgrid/SendGrid.java

@@ -26,7 +26,7 @@
 import org.apache.http.entity.ContentType;
 
 public class SendGrid {
-    private static final String VERSION = "2.1.1";
+    private static final String VERSION = "2.2.0";
     private static final String USER_AGENT = "sendgrid/" + VERSION + ";java";
 
     private static final String PARAM_TO = "to[%d]";
@@ -53,6 +53,12 @@ public class SendGrid {
     private String endpoint;
     private CloseableHttpClient client;
 
+    /**
+     * Constructor for using a username and password
+     *
+     * @param username
+     * @param password
+     */
     public SendGrid(String username, String password) {
         this.username = username;
         this.password = password;
@@ -61,6 +67,19 @@ public SendGrid(String username, String password) {
         this.client = HttpClientBuilder.create().setUserAgent(USER_AGENT).build();
     }
 
+    /**
+     * Constructor for using an API key
+     *
+     * @param apiKey
+     */
+    public SendGrid(String apiKey) {
+        this.password = apiKey;
+        this.username = null;
+        this.url = "https://api.sendgrid.com";
+        this.endpoint = "/api/mail.send.json";
+        this.client = HttpClientBuilder.create().setUserAgent(USER_AGENT).build();
+    }
+
     public SendGrid setUrl(String url) {
         this.url = url;
         return this;
@@ -83,8 +102,11 @@ public SendGrid setClient(CloseableHttpClient client) {
     public HttpEntity buildBody(Email email) {
         MultipartEntityBuilder builder = MultipartEntityBuilder.create();
 
-        builder.addTextBody("api_user", this.username);
-        builder.addTextBody("api_key", this.password);
+        // We are using an API key
+        if (this.username != null) {
+            builder.addTextBody("api_user", this.username);
+            builder.addTextBody("api_key", this.password);
+        }
 
         String[] tos = email.getTos();
         String[] tonames = email.getToNames();
@@ -152,6 +174,11 @@ public SendGrid.Response send(Email email) throws SendGridException {
         HttpPost httppost = new HttpPost(this.url + this.endpoint);
         httppost.setEntity(this.buildBody(email));
 
+        // Using an API key
+        if (this.username == null) {
+            httppost.setHeader("Authorization", "Bearer " + this.password);
+        }
+
         try {
             HttpResponse res = this.client.execute(httppost);
             return new SendGrid.Response(res.getStatusLine().getStatusCode(), EntityUtils.toString(res.getEntity()));

src/test/java/com/sendgrid/SendGridTest.java

@@ -1,5 +1,9 @@
 package com.sendgrid;
 
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -19,7 +23,42 @@ public class SendGridTest {
     @Test
     public void testVersion() {
         SendGrid client = new SendGrid(USERNAME, PASSWORD);
-        assertEquals(client.getVersion(), "2.1.1");
+        assertEquals(client.getVersion(), "2.2.0");
+    }
+
+    @Test
+    public void testBuildGradleVersion() {
+        try {
+            SendGrid client = new SendGrid(USERNAME, PASSWORD);
+            BufferedReader br = new BufferedReader(new FileReader("./build.gradle"));
+            String line = br.readLine();
+            String regex = "version\\s*=\\s*'" + client.getVersion() + "'";
+
+            while (line != null) {
+                if (line.matches(regex)) {
+                    br.close();
+                    return;
+                }
+                line = br.readLine();
+            }
+            br.close();
+            fail("build.gradle version does not match");
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Test
+    public void testUsernamePasswordConstructor() {
+        SendGrid client = new SendGrid(USERNAME, PASSWORD);
+    }
+
+    @Test
+    public void testApiKeyConstructor() {
+        SendGrid client = new SendGrid(PASSWORD);
     }
 
     @Test