Implement Issue influxdata#389 : Support for MessagePack

Author: lxhoan

pom.xml

@@ -255,6 +255,11 @@
       <artifactId>converter-moshi</artifactId>
       <version>2.4.0</version>
     </dependency>
+    <dependency>
+    <groupId>org.komamitsu</groupId>
+      <artifactId>retrofit-converter-msgpack</artifactId>
+      <version>1.0.0</version>
+    </dependency>
     <!-- If we use okhttp instead of java urlconnection we achieve server failover
             of the influxdb server address resolves to all influxdb server ips. -->
     <dependency>

src/main/java/org/influxdb/InfluxDBFactory.java

@@ -78,9 +78,30 @@ public static InfluxDB connect(final String url, final OkHttpClient.Builder clie
    */
   public static InfluxDB connect(final String url, final String username, final String password,
       final OkHttpClient.Builder client) {
+    return connect(url, username, password, client, false);
+  }
+
+  /**
+   * Create a connection to a InfluxDB.
+   *
+   * @param url
+   *            the url to connect to.
+   * @param username
+   *            the username which is used to authorize against the influxDB instance.
+   * @param password
+   *            the password for the username which is used to authorize against the influxDB
+   *            instance.
+   * @param client
+   *            the HTTP client to use
+   * @param useMsgPack
+   *            Accept MessagePack format (TRUE) or JSon (FALSE) for response from InfluxDB server
+   * @return a InfluxDB adapter suitable to access a InfluxDB.
+   */
+  public static InfluxDB connect(final String url, final String username, final String password,
+      final OkHttpClient.Builder client, final boolean useMsgPack) {
     Preconditions.checkNonEmptyString(url, "url");
     Preconditions.checkNonEmptyString(username, "username");
     Objects.requireNonNull(client, "client");
-    return new InfluxDBImpl(url, username, password, client);
+    return new InfluxDBImpl(url, username, password, client, useMsgPack);
   }
 }

src/main/java/org/influxdb/dto/QueryResult.java

@@ -3,6 +3,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 /**
  * {Purpose of This Type}.
  *
@@ -68,10 +70,20 @@ public void setError(final String error) {
     this.error = error;
   }
 
+  @JsonIgnoreProperties(ignoreUnknown = true)
   public static class Result {
+    private List<Abc> abc;
     private List<Series> series;
     private String error;
 
+    public List<Abc> getAbc() {
+      return abc;
+    }
+
+    public void setAbc(final List<Abc> abc) {
+      this.abc = abc;
+    }
+
     /**
      * @return the series
      */
@@ -128,6 +140,93 @@ public String toString() {
 
   }
 
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  public static class Abc {
+    private String name;
+    private Map<String, String> tags;
+    private List<String> columns;
+    private List<List<Object>> values;
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+      return this.name;
+    }
+
+    /**
+     * @param name
+     *            the name to set
+     */
+    public void setName(final String name) {
+      this.name = name;
+    }
+
+    /**
+     * @return the tags
+     */
+    public Map<String, String> getTags() {
+      return this.tags;
+    }
+
+    /**
+     * @param tags
+     *            the tags to set
+     */
+    public void setTags(final Map<String, String> tags) {
+      this.tags = tags;
+    }
+
+    /**
+     * @return the columns
+     */
+    public List<String> getColumns() {
+      return this.columns;
+    }
+
+    /**
+     * @param columns
+     *            the columns to set
+     */
+    public void setColumns(final List<String> columns) {
+      this.columns = columns;
+    }
+
+    /**
+     * @return the values
+     */
+    public List<List<Object>> getValues() {
+      return this.values;
+    }
+
+    /**
+     * @param values
+     *            the values to set
+     */
+    public void setValues(final List<List<Object>> values) {
+      this.values = values;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String toString() {
+      StringBuilder builder = new StringBuilder();
+      builder.append("Series [name=");
+      builder.append(this.name);
+      builder.append(", tags=");
+      builder.append(this.tags);
+      builder.append(", columns=");
+      builder.append(this.columns);
+      builder.append(", values=");
+      builder.append(this.values);
+      builder.append("]");
+      return builder.toString();
+    }
+  }
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
   public static class Series {
     private String name;
     private Map<String, String> tags;