Merge pull request #209 from tigergraph/jdbc-dev-sync

[Automated]JDBC Driver Release 1.3.12
tigergraph · Oct 28, 2023 · ae3d743 · ae3d743
2 parents af106b9 + 42041d3
commit ae3d743
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 6 deletions.
diff --git a/tools/etl/tg-jdbc-driver/CHANGELOG.md b/tools/etl/tg-jdbc-driver/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Release 1.3.12
+* Supported TG Version: 2.4.1+
+* Ensuring compatibility with Java 8.
+
 ## Release 1.3.11
 * Supported TG Version: 2.4.1+
 * Bugfixes:

diff --git a/tools/etl/tg-jdbc-driver/tg-jdbc-driver/pom.xml b/tools/etl/tg-jdbc-driver/tg-jdbc-driver/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.tigergraph</groupId>
     <artifactId>tigergraph-jdbc-driver</artifactId>
-    <version>1.3.11</version>
+    <version>1.3.12</version>
     <packaging>jar</packaging>
 
     <name>TigerGraph JDBC Driver Parent</name>
@@ -129,6 +129,32 @@
     <!-- default build plugins -->
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <version>1.19</version>
+                <executions>
+                    <execution>
+                    <id>check-java-8-compatibility</id>
+                    <phase>compile</phase>
+                    <goals>
+                        <goal>check</goal>
+                    </goals>
+                    <configuration>
+                        <signature>
+                            <groupId>org.codehaus.mojo.signature</groupId>
+                            <artifactId>java18</artifactId>
+                            <version>1.0</version>
+                        </signature>
+                    </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

diff --git a/...jdbc-driver/tg-jdbc-driver/src/main/java/com/tigergraph/jdbc/restpp/RestppConnection.java b/...jdbc-driver/tg-jdbc-driver/src/main/java/com/tigergraph/jdbc/restpp/RestppConnection.java
@@ -54,6 +54,7 @@
 import java.util.Properties;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.Random;
 import org.slf4j.Logger;
@@ -197,14 +198,16 @@ public RestppConnection(
         this.maxRetryCount = Integer.valueOf(properties.getProperty("maxRetryCount"));
       }
 
-      // Starting from v3.9.0, TG supports providing loading job statistics based on jobid
+      // Starting from v3.9.0, TG supports providing loading job statistics based on
+      // jobid
       if (properties.containsKey("jobid")
           && this.tg_version.compareTo(new ComparableVersion("3.9.0")) >= 0) {
         this.jobid = properties.getProperty("jobid");
         logger.info("The loading job ID of current connection: {}", this.jobid);
       }
 
-      // Starting from v3.9.0, TG supports terminating loading jobs based on the max number of
+      // Starting from v3.9.0, TG supports terminating loading jobs based on the max
+      // number of
       // errors.
       if (properties.containsKey("max_num_error")
           && this.tg_version.compareTo(new ComparableVersion("3.9.0")) >= 0) {
@@ -214,7 +217,8 @@ public RestppConnection(
         }
       }
 
-      // Starting from v3.9.0, TG supports terminating loading jobs based on the max percentage of
+      // Starting from v3.9.0, TG supports terminating loading jobs based on the max
+      // percentage of
       // errors.
       if (properties.containsKey("max_percent_error")
           && this.tg_version.compareTo(new ComparableVersion("3.9.0")) >= 0) {
@@ -382,7 +386,8 @@ public RestppConnection(
       builder.setUserAgent(userAgent);
     }
     // Set the timeout for establishing a connection
-    // The socketTimeout should be longer then queryTimeout to avoid timeout before query finishes
+    // The socketTimeout should be longer then queryTimeout to avoid timeout before
+    // query finishes
     this.socketTimeout = Math.max(this.socketTimeout, this.queryTimeout + 5 * 60);
     builder.setDefaultRequestConfig(
         RequestConfig.custom()
@@ -436,7 +441,7 @@ public RestppConnection(
           private int count = 1;
           private String cause;
           private static final long maxRetryInterval = 10 * 60 * 1000; // 10min
-          private final List<Integer> retriableCode = List.of(408, 500, 502, 503, 504);
+          private final List<Integer> retriableCode = Arrays.asList(408, 500, 502, 503, 504);
 
           @Override
           public boolean retryRequest(