Merge pull request #14 from anaplaninc/release/1.4.2

Release/1.4.2
anaplaninc · Jul 25, 2019 · a2e0281 · a2e0281
2 parents 9817ce0 + fadc00b
commit a2e0281
Show file tree

Hide file tree

Showing 29 changed files with 941 additions and 119 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -6,38 +6,38 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.anaplan.client</groupId>
     <artifactId>anaplan-connect</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <name>Anaplan Connect</name>
 
     <properties>
         <category>Community</category>
         <licensePath>LICENSE.md</licensePath>
         <maven.build.timestamp.format>MMM dd, yyyy @ KK:mm:ss a (z)</maven.build.timestamp.format>
         <jdk.version>1.8</jdk.version>
-        <compiler.plugin.version>3.7.0</compiler.plugin.version>
-        <feign-jackson.version>9.6.0</feign-jackson.version>
+        <compiler.plugin.version>3.8.0</compiler.plugin.version>
+        <feign-jackson.version>10.0.0</feign-jackson.version>
         <github.global.server>github</github.global.server>
-        <junit.version>4.11</junit.version>
+        <junit.version>4.12</junit.version>
         <logback.version>1.2.3</logback.version>
-        <commons.codec.version>1.11</commons.codec.version>
+        <commons.codec.version>1.12</commons.codec.version>
         <commons.io.version>2.6</commons.io.version>
-        <org.apache.httpcomponents.httpcore.version>4.4.10</org.apache.httpcomponents.httpcore.version>
-        <org.apache.httpcomponents.httpclient.version>4.5.6</org.apache.httpcomponents.httpclient.version>
-        <org.apache.httpcomponents.httpmime.version>4.5.6</org.apache.httpcomponents.httpmime.version>
-        <org.apache.httpcomponents.fluent-hc.version>4.5.6</org.apache.httpcomponents.fluent-hc.version>
-        <guava.version>23.6-jre</guava.version>
-        <opencsv.version>4.1</opencsv.version>
-        <h2.version>1.4.196</h2.version>
+        <org.apache.httpcomponents.httpcore.version>4.4.11</org.apache.httpcomponents.httpcore.version>
+        <org.apache.httpcomponents.httpclient.version>4.5.7</org.apache.httpcomponents.httpclient.version>
+        <org.apache.httpcomponents.httpmime.version>4.5.7</org.apache.httpcomponents.httpmime.version>
+        <org.apache.httpcomponents.fluent-hc.version>4.5.7</org.apache.httpcomponents.fluent-hc.version>
+        <guava.version>27.0.1-jre</guava.version>
+        <opencsv.version>4.5</opencsv.version>
+        <h2.version>1.4.197</h2.version>
         <jcifs.version>1.3.17</jcifs.version>
-        <feign.version>9.5.1</feign.version>
+        <feign.version>10.0.0</feign.version>
         <jackson.version>2.9.8</jackson.version>
         <maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
         <github.maven.plugin.version>0.12</github.maven.plugin.version>
-        <maven.javadoc.plugin.version>3.0.0</maven.javadoc.plugin.version>
+        <maven.javadoc.plugin.version>3.0.1</maven.javadoc.plugin.version>
         <mockito.version>1.10.19</mockito.version>
         <mysql.connector.version>5.1.6</mysql.connector.version>
         <lombok.version>1.16.18</lombok.version>
-        <bouncycastle.version>1.60</bouncycastle.version>
+        <bouncycastle.version>1.61</bouncycastle.version>
         <not.yet.commons.ssl.version>0.3.9</not.yet.commons.ssl.version>
     </properties>
 

diff --git a/java/src/main/java/com/anaplan/client/CellWriter.java b/java/src/main/java/com/anaplan/client/CellWriter.java
@@ -17,6 +17,8 @@
 import com.anaplan.client.ex.AnaplanAPIException;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.sql.SQLException;
 
 /**
  * Abstract sink for tabulated cell data.
@@ -38,7 +40,16 @@ public interface CellWriter {
      *
      * @param row An array of string cell values, one per column
      */
-    void writeDataRow(Object[] row) throws AnaplanAPIException, IOException;
+    void writeDataRow(Object[] row) throws AnaplanAPIException, IOException, SQLException;
+
+    /**
+     * Write a data row.
+     * This should be called after writeHeaderRow, for each line of data.
+     *
+     * @param separator An array of string cell values, one per column
+     */
+
+    int writeDataRow(String exportId,int maxRetryCount,int retryTimeout, InputStream inputStream,int chunks,String chunkId, int[] mapcols, int columnCount, String separator) throws AnaplanAPIException, IOException, SQLException;
 
     /**
      * Complete the transfer. Any remaining data is transferred,

diff --git a/java/src/main/java/com/anaplan/client/Constants.java b/java/src/main/java/com/anaplan/client/Constants.java
@@ -9,14 +9,15 @@ public class Constants {
 
     public static final int AC_MAJOR = 1;
     public static final int AC_MINOR = 4;
-    public static final int AC_REVISION = 1 ;
+    public static final int AC_REVISION = 2 ;
+    public static final String AC_Release = "-Snapshot";
 
     public static final boolean AUTH_CLIENT_CACHE_ENABLED = false;
 
     public static final Integer AUTH_TTL_SECONDS = 30;
 
     public static final String X_ACONNECT_HEADER_KEY = "X-AConnect-Client";
-    public static final String X_ACONNECT_HEADER_VALUE = "Anaplan_Connect_1.4.1";
+    public static final String X_ACONNECT_HEADER_VALUE = "Anaplan_Connect_1.4.2";
     public static final String X_ACONNECT_HEADER = X_ACONNECT_HEADER_KEY + ":" + X_ACONNECT_HEADER_VALUE;
 
     public static final String CORS_HEADER_KEY = "Origin";
@@ -30,4 +31,6 @@ public class Constants {
 
     public static final int MIN_HTTP_CONNECTION_TIMEOUT_SECS = 3;
     public static final int MAX_HTTP_CONNECTION_TIMEOUT_SECS = 60;
+
+    public static final double DEFAULT_BACKOFF_MULTIPLIER = 1.5;
 }