update version to 5.17.0

Author: yunjinlxp

README.md

@@ -9,19 +9,19 @@
  - 阿里云表格存储是阿里云自主研发的NoSQL数据存储服务，提供海量结构化数据的存储和实时访问。
 
 ## 版本
- - 当前版本：5.16.1
+ - 当前版本：5.17.0
 
 ## 运行环境
  - JDK 6及其以上
 
 ## 安装
 #### Maven方式
-下载[最新版JAR包](https://search.maven.org/remotecontent?filepath=com/aliyun/openservices/tablestore/5.16.1/tablestore-5.16.1.jar)或者通过Maven：
+下载[最新版JAR包](https://search.maven.org/remotecontent?filepath=com/aliyun/openservices/tablestore/5.17.0/tablestore-5.17.0.jar)或者通过Maven：
 ```xml
 <dependency>
   <groupId>com.aliyun.openservices</groupId>
   <artifactId>tablestore</artifactId>
-  <version>5.16.1</version>
+  <version>5.17.0</version>
 </dependency>
 ```
 

pom.xml

@@ -3,10 +3,10 @@
   <modelVersion>4.0.0</modelVersion>  
   <groupId>com.aliyun.openservices</groupId>  
   <artifactId>tablestore</artifactId>  
-  <version>5.16.3</version>
+  <version>5.17.0</version>
   <packaging>jar</packaging>  
   <name>AliCloud TableStore SDK for Java</name>  
-  <url>http://www.aliyun.com</url>  
+  <url>http://www.aliyun.com</url>
   <description>Aliyun Open Services SDK for Java Copyright (C) Alibaba Cloud Computing All rights reserved. 版权所有 （C）阿里云计算有限公司 http://www.aliyun.com</description>  
   <licenses>
     <license>
@@ -50,7 +50,7 @@
     <dependency> 
       <groupId>junit</groupId>  
       <artifactId>junit</artifactId>  
-      <version>4.10</version>  
+      <version>4.10</version>
       <scope>test</scope> 
     </dependency>  
     <dependency> 
@@ -120,8 +120,8 @@
         <artifactId>maven-compiler-plugin</artifactId>  
         <version>2.3.2</version>  
         <configuration> 
-          <source>1.6</source>  
-          <target>1.6</target>  
+          <source>1.8</source>
+          <target>1.8</target>  
           <encoding>UTF-8</encoding> 
         </configuration> 
       </plugin>  
@@ -147,9 +147,9 @@
       <plugin> 
         <groupId>org.apache.maven.plugins</groupId>  
         <artifactId>maven-surefire-plugin</artifactId>  
-        <version>2.10</version>  
+        <version>3.2.2</version>
         <configuration> 
-          <argLine>-Dfile.encoding=UTF-8</argLine> 
+          <argLine>@{argLine} -Dfile.encoding=UTF-8</argLine> 
         </configuration>  
         <executions> 
           <execution> 
@@ -226,7 +226,12 @@
               <exclude>commons-codec:commons-codec:jar:</exclude>  
               <exclude>org.hamcrest:hamcrest-core:jar:</exclude>  
               <exclude>com.google.code.gson:gson:jar:</exclude>  
-              <exclude>com.google.guava:guava:jar:</exclude> 
+              <exclude>com.google.guava:*</exclude> 
+              <exclude>com.google.errorprone:*</exclude> 
+              <exclude>com.google.code.findbugs:*</exclude> 
+              <exclude>org.checkerframework:*</exclude> 
+              <exclude>com.google.j2objc:*</exclude> 
+              <exclude>org.codehaus.mojo:*</exclude> 
             </excludes> 
           </artifactSet>  
           <relocations> 
@@ -271,17 +276,27 @@
             </goals> 
           </execution> 
         </executions> 
-      </plugin> 
+      </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.5</version>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.10</version>
+        <configuration>
+          <excludes>
+            <exclude>**/examples/*.java</exclude>
+          </excludes>
+        </configuration>
         <executions>
           <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
+            <id>default-prepare-agent</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-report</id>
             <goals>
-              <goal>sign</goal>
+              <goal>report</goal>
             </goals>
           </execution>
         </executions>
@@ -292,11 +307,11 @@
         <version>1.6.3</version>
         <extensions>true</extensions>
         <configuration>
-                <serverId>sonatype-nexus-staging</serverId>
-                <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                <autoReleaseAfterClose>true</autoReleaseAfterClose>
+          <serverId>sonatype-nexus-staging</serverId>
+          <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
         </configuration>
       </plugin>
     </plugins> 
-  </build>  
+  </build>
 </project>

src/main/java/com/alicloud/openservices/tablestore/ClientConfiguration.java

@@ -49,12 +49,19 @@ public class ClientConfiguration {
     private int dnsCacheExpireAfterWriteSec = 600;
     private int dnsCacheRefreshAfterWriteSec = 300;
 
-
     /**
      * 链路追踪系统接口
      */
     private RequestTracer requestTracer;
 
+    /**
+     * 设置SSL session的cache size和timeout；
+     * 没有配置则使用JDK默认值：
+     * 通过SSLContexts.createDefault().getSessionCacheSize()和SSLContexts.createDefault().getSessionTimeout()查看默认值
+     */
+    private int sslSessionCacheSize = -1; // -1代表没有配置
+    private int sslSessionTimeoutInSec = -1; // -1代表没有配置
+
     /**
      * 构造新实例。
      */
@@ -542,4 +549,38 @@ public void setRequestTracer(RequestTracer requestTracer) {
     public RequestTracer getRequestTracer() {
         return requestTracer;
     }
+
+    /**
+     * 设置ssl session的cache size
+     *
+     * @param sslSessionCacheSize ssl session的cache size
+     */
+    public void setSslSessionCacheSize(int sslSessionCacheSize) {
+        Preconditions.checkArgument(sslSessionCacheSize >= 0, "SSL session cache size should be no less than 0.");
+        this.sslSessionCacheSize = sslSessionCacheSize;
+    }
+
+    /**
+     * 获取ssl session的cache size
+     *
+     * @return sslSessionCacheSize
+     */
+    public int getSslSessionCacheSize() { return sslSessionCacheSize; }
+
+    /**
+     * 设置ssl session的timeout
+     *
+     * @param seconds ssl session的timeout，0代表没有限制；timeout大小应不小于0，秒为单位
+     */
+    public void setSslSessionTimeoutInSec(int seconds) {
+        Preconditions.checkArgument(seconds >= 0, "SSL session timeout should be no less than 0.");
+        this.sslSessionTimeoutInSec = seconds;
+    }
+
+    /**
+     * 获取ssl session的timeout
+     *
+     * @return sslSessionTimeout ssl session的timeout，0代表没有限制，-1代表没有配置；timeout以秒为单位
+     */
+    public int getSslSessionTimeoutInSec() { return sslSessionTimeoutInSec; }
 }

src/main/java/com/alicloud/openservices/tablestore/core/Constants.java

@@ -5,7 +5,7 @@
 public class Constants {
     // ALL HTTP HEADERS SHOULD BE DEFINED IN LOWERCASE
     // request headers
-    public static final String USER_AGENT = "ots-java-sdk 5.16.3";
+    public static final String USER_AGENT = "ots-java-sdk 5.17.0";
     public static final String OTS_HEADER_API_VERSION = "x-ots-apiversion";
     public static final String OTS_HEADER_ACCESS_KEY_ID = "x-ots-accesskeyid";
     public static final String OTS_HEADER_OTS_CONTENT_MD5 = "x-ots-contentmd5";

src/main/java/com/alicloud/openservices/tablestore/core/auth/InstanceProfileCredentialsFetcher.java

@@ -19,16 +19,16 @@
 
 package com.alicloud.openservices.tablestore.core.auth;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import com.alicloud.openservices.tablestore.ClientException;
 import com.alicloud.openservices.tablestore.core.utils.HttpResponse;
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-
 public class InstanceProfileCredentialsFetcher extends HttpCredentialsFetcher {
 
     private Logger logger = LoggerFactory.getLogger(InstanceProfileCredentialsFetcher.class);
@@ -76,18 +76,23 @@ private static class MetadataResponse {
 
     @Override
     public ServiceCredentials parse(HttpResponse response) throws ClientException {
+        if (response.getHttpContent() == null) {
+            logger.error("Invalid response from ECS Metadata service: null.");
+            throw new ClientException("Invalid json got from ECS Metadata service.");
+        }
+
         String jsonContent = new String(response.getHttpContent());
 
         try {
             MetadataResponse res = new Gson().fromJson(jsonContent, MetadataResponse.class);
             if (res == null) {
-                logger.error("Invalid response form ECS Metadata service: {}.", jsonContent);
+                logger.error("Invalid response from ECS Metadata service: {}.", jsonContent);
                 throw new ClientException("Invalid json got from ECS Metadata service.");
             }
 
             if (!(res.code != null && res.accessKeyId != null && res.accessKeySecret != null
                 && res.securityToken != null && res.expiration != null)) {
-                logger.error("Invalid response form ECS Metadata service: {}.", jsonContent);
+                logger.error("Invalid response from ECS Metadata service: {}.", jsonContent);
                 throw new ClientException("Invalid json got from ECS Metadata service.");
             }
 

src/main/java/com/alicloud/openservices/tablestore/core/auth/InstanceProfileCredentialsProvider.java

@@ -74,7 +74,7 @@ public InstanceProfileCredentials getCredentials() {
                 } else if (shouldRefreshCredentials()) {
                     try {
                         isFetching.set(true);
-                        credentials = (InstanceProfileCredentials) fetcher.fetch();
+                        credentials = (InstanceProfileCredentials) fetcher.fetch(maxRetryTimes);
                     } catch (ClientException e) {
                         // Use the current expiring session token and wait for next round
                         credentials.setLastFailedRefreshTime();

src/main/java/com/alicloud/openservices/tablestore/core/http/AsyncServiceClient.java

@@ -11,6 +11,7 @@
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.DnsResolver;
+import org.apache.http.conn.ssl.SSLContexts;
 import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
 import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
 import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
@@ -29,6 +30,8 @@
 import com.alicloud.openservices.tablestore.core.TraceLogger;
 import com.alicloud.openservices.tablestore.core.utils.Preconditions;
 
+import javax.net.ssl.SSLContext;
+
 import static com.alicloud.openservices.tablestore.core.utils.LogUtil.*;
 
 public class AsyncServiceClient {
@@ -42,9 +45,19 @@ public AsyncServiceClient(ClientConfiguration config) {
                     .setIoThreadCount(config.getIoThreadCount()).build();
             ConnectingIOReactor ioReactor = new DefaultConnectingIOReactor(
                     ioReactorConfig);
+
+            SSLContext sslContext = SSLContexts.createDefault();
+            if (config.getSslSessionCacheSize() >= 0) {
+                sslContext.getClientSessionContext().setSessionCacheSize(config.getSslSessionCacheSize());
+            }
+            if (config.getSslSessionTimeoutInSec() >= 0) {
+                sslContext.getClientSessionContext().setSessionTimeout(config.getSslSessionTimeoutInSec());
+            }
+            SSLIOSessionStrategy sslioSessionStrategy = new SSLIOSessionStrategy(sslContext, SSLIOSessionStrategy.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
+
             Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry = RegistryBuilder.<SchemeIOSessionStrategy>create()
                     .register("http", NoopIOSessionStrategy.INSTANCE)
-                    .register("https", SSLIOSessionStrategy.getDefaultStrategy())
+                    .register("https", sslioSessionStrategy)
                     .build();
             DnsResolver dnsResolver = null;
             if (config.isEnableDnsCache()) {

src/main/java/com/alicloud/openservices/tablestore/core/protocol/OTSProtocolParser.java

@@ -2,6 +2,7 @@
 
 import com.alicloud.openservices.tablestore.ClientException;
 import com.alicloud.openservices.tablestore.model.*;
+import com.alicloud.openservices.tablestore.model.search.SyncStat;
 import com.alicloud.openservices.tablestore.model.sql.SQLPayloadVersion;
 import com.alicloud.openservices.tablestore.model.sql.SQLStatementType;
 
@@ -86,6 +87,13 @@ public static IndexUpdateMode parseIndexUpdateMode(OtsInternalApi.IndexUpdateMod
         }
     }
 
+    public static SyncStat.SyncPhase parseIndexSyncPhase(OtsInternalApi.IndexSyncPhase indexSyncPhase) {
+        if (indexSyncPhase == OtsInternalApi.IndexSyncPhase.ISP_INCR) {
+            return SyncStat.SyncPhase.INCR;
+        }
+        return SyncStat.SyncPhase.FULL;
+    }
+
     public static IndexMeta parseIndexMeta(OtsInternalApi.IndexMeta indexMeta) {
         IndexMeta result = new IndexMeta(indexMeta.getName());
         for (String pk : indexMeta.getPrimaryKeyList()) {
@@ -96,6 +104,9 @@ public static IndexMeta parseIndexMeta(OtsInternalApi.IndexMeta indexMeta) {
         }
         result.setIndexType(parseIndexType(indexMeta.getIndexType()));
         result.setIndexUpdateMode(parseIndexUpdateMode(indexMeta.getIndexUpdateMode()));
+        if (indexMeta.hasIndexSyncPhase()) {
+            result.setIndexSyncPhase(parseIndexSyncPhase(indexMeta.getIndexSyncPhase()));
+        }
 
         return result;
     }