Merge pull request #4 from databox/pushapi-v3

Support Databox API version 3

Author: umajeric

CHANGELOG.md

@@ -0,0 +1,22 @@
+# Change Log
+Following guidelines of http://keepachangelog.com/
+
+## [Unreleased]
+- update to support Databox API version 3
+
+## [2.2] - Apr 15, 2016
+- Support for `GET /lastpushes`
+- Usage of `.editorconfig`
+- Usage of [DatatypeConverter](https://docs.oracle.com/javase/7/docs/api/javax/xml/bind/DatatypeConverter.html) for `base64` encoding
+- `KPI` is now separate class
+- Usage of [findbugs](http://findbugs.sourceforge.net/)
+- TravisCI now tests SDK on Java 1.7 and Java 1.8
+- Small update to test suite
+- Example for `lastpushes` was added.
+
+## [2.0] - Jan 8, 2016
+- Test case and sample updated to match 2.0 Push API
+
+[Unreleased]: https://github.com/databox/databox-java/compare/2.2...master
+[2.2]: https://github.com/databox/databox-java/compare/2.0...2.2
+[2.0]: https://github.com/databox/databox-java/tree/2.0

src/main/java/com/databox/sdk/Databox.java

@@ -19,8 +19,8 @@
 
 public class Databox {
   static final Logger logger = LoggerFactory.getLogger(Databox.class);
-  private static final String DEFAULT_HOST = "https://push2new.databox.com";
-  private static final String CLIENT_VERSION = "2.2";
+  private static final String DEFAULT_HOST = "https://push.databox.com";
+  private static final String CLIENT_VERSION = "2.3.0";
 
   private final String _token;
   private String _host;
@@ -78,8 +78,9 @@ private boolean push(String rawData) {
       conn = (HttpURLConnection) url.openConnection();
       conn.setRequestMethod("POST");
       conn.setRequestProperty("Content-Type", "application/json");
-      conn.setRequestProperty("User-Agent", "Databox/" + CLIENT_VERSION + " (Java)");
-      String encodedToken = base64Encode((_token + ": ").getBytes("UTF-8"));
+      conn.setRequestProperty("User-Agent", "databox-java/" + CLIENT_VERSION);
+      conn.setRequestProperty("Accept", "application/vnd.databox.v" + CLIENT_VERSION.split("\\.")[0] + "+json");
+      String encodedToken = base64Encode((_token + ":").getBytes("UTF-8"));
       conn.setRequestProperty("Authorization", "Basic " + encodedToken);
       conn.setDoOutput(true);
       conn.setDoInput(true);
@@ -125,10 +126,11 @@ private boolean push(String rawData) {
 
   private HttpURLConnection buildConnection(String method, String path) throws IOException {
     HttpURLConnection connection = (HttpURLConnection) (new URL(_host + path)).openConnection();
-    String encodedToken = base64Encode((_token + ": ").getBytes("UTF-8"));
+    String encodedToken = base64Encode((_token + ":").getBytes("UTF-8"));
     connection.setRequestProperty("Authorization", "Basic " + encodedToken);
     connection.setRequestProperty("Content-Type", "application/json");
-    connection.setRequestProperty("User-Agent", "Databox/" + CLIENT_VERSION + " (Java)");
+    connection.setRequestProperty("User-Agent", "databox-java/" + CLIENT_VERSION);
+    connection.setRequestProperty("Accept", "application/vnd.databox.v" + CLIENT_VERSION.split("\\.")[0] + "+json");
     connection.setRequestMethod(method);
     connection.setDoOutput(true);
     connection.setDoInput(true);
@@ -184,14 +186,37 @@ private StringBuffer post(String path, String rawData) throws IOException {
     return responseAsString;
   }
 
+  private StringBuffer delete(String path) throws IOException {
+    HttpURLConnection connection = buildConnection("DELETE", path);
+    connection.connect();
+
+    int responseCode = connection.getResponseCode();
+
+    StringBuffer responseAsString = handleResponseInputStream(
+      (responseCode >= 200 && responseCode < 300) ? connection.getInputStream() : connection.getErrorStream());
+
+    lastResponseCode = responseCode;
+
+    connection.disconnect();
+    return responseAsString;
+  }
+
   public StringBuffer lastPushes(int n) throws IOException {
-    return get("/lastpushes/" + (n + ""));
+    return get("/lastpushes?limit=" + (n + ""));
   }
 
   public StringBuffer lastPush() throws IOException {
     return lastPushes(1);
   }
 
+  public StringBuffer metrics() throws IOException {
+    return get("/metrickeys");
+  }
+
+  public StringBuffer purge() throws IOException {
+    return delete("/data");
+  }
+
   private String base64Encode(byte[] input) {
     return DatatypeConverter.printBase64Binary(input);
   }

src/main/java/com/databox/sdk/KPI.java

@@ -13,6 +13,7 @@ public class KPI {
   private String key;
   private Object value;
   private Date date;
+  private String unit;
   private Map<String, Object> attributes = new HashMap<>();
 
   static {
@@ -50,6 +51,15 @@ public KPI setDate(Date date) {
     return this;
   }
 
+  public String getUnit() {
+    return unit;
+  }
+
+  public KPI setUnit(String unit) {
+    this.unit = unit;
+    return this;
+  }
+
   public KPI addAttribute(String key, Object value) {
     attributes.put(key, value);
     return this;
@@ -82,6 +92,9 @@ public String toString() {
     if (date != null) {
       json += ", \"date\": \"" + SDF.format(date) + "\"";
     }
+    if (unit != null) {
+      json += ", \"unit\": \"" + unit + "\"";
+    }
     for (Map.Entry<String, Object> attribute : attributes.entrySet()) {
       json += ", \"" + attribute.getKey() + "\": \"" + attribute.getValue() + "\"";
     }