Merge pull request #41 from aliyun/v5.15.0

update version to 5.15.0

Author: whybert

README.md

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

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>  
   <groupId>com.aliyun.openservices</groupId>  
   <artifactId>tablestore</artifactId>  
-  <version>5.13.15</version>  
+  <version>5.15.0</version>  
   <packaging>jar</packaging>  
   <name>AliCloud TableStore SDK for Java</name>  
   <url>http://www.aliyun.com</url>  

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

@@ -204,6 +204,34 @@ public Future<ScanTimeseriesDataResponse> scanTimeseriesData(ScanTimeseriesDataR
         return internalClient.scanTimeseriesData(request, callback);
     }
 
+    @Override
+    public Future<CreateTimeseriesAnalyticalStoreResponse> createTimeseriesAnalyticalStore(CreateTimeseriesAnalyticalStoreRequest request,
+                                                                                           TableStoreCallback<CreateTimeseriesAnalyticalStoreRequest, CreateTimeseriesAnalyticalStoreResponse> callback)
+            throws TableStoreException, ClientException {
+        return internalClient.createTimeseriesAnalyticalStore(request, callback);
+    }
+
+    @Override
+    public Future<DeleteTimeseriesAnalyticalStoreResponse> deleteTimeseriesAnalyticalStore(DeleteTimeseriesAnalyticalStoreRequest request,
+                                                                                           TableStoreCallback<DeleteTimeseriesAnalyticalStoreRequest, DeleteTimeseriesAnalyticalStoreResponse> callback)
+            throws TableStoreException, ClientException {
+        return internalClient.deleteTimeseriesAnalyticalStore(request, callback);
+    }
+
+    @Override
+    public Future<DescribeTimeseriesAnalyticalStoreResponse> describeTimeseriesAnalyticalStore(DescribeTimeseriesAnalyticalStoreRequest request,
+                                                                                               TableStoreCallback<DescribeTimeseriesAnalyticalStoreRequest, DescribeTimeseriesAnalyticalStoreResponse> callback)
+            throws TableStoreException, ClientException {
+        return internalClient.describeTimeseriesAnalyticalStore(request, callback);
+    }
+
+    @Override
+    public Future<UpdateTimeseriesAnalyticalStoreResponse> updateTimeseriesAnalyticalStore(UpdateTimeseriesAnalyticalStoreRequest request,
+                                                                                           TableStoreCallback<UpdateTimeseriesAnalyticalStoreRequest, UpdateTimeseriesAnalyticalStoreResponse> callback)
+            throws TableStoreException, ClientException {
+        return internalClient.updateTimeseriesAnalyticalStore(request, callback);
+    }
+
     public void shutdown() {
         this.internalClient.shutdown();
     }

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

@@ -48,6 +48,22 @@ Future<ScanTimeseriesDataResponse> scanTimeseriesData(ScanTimeseriesDataRequest
                                                           TableStoreCallback<ScanTimeseriesDataRequest, ScanTimeseriesDataResponse> callback)
             throws TableStoreException, ClientException;
 
+    Future<CreateTimeseriesAnalyticalStoreResponse> createTimeseriesAnalyticalStore(CreateTimeseriesAnalyticalStoreRequest request,
+                                                                                    TableStoreCallback<CreateTimeseriesAnalyticalStoreRequest, CreateTimeseriesAnalyticalStoreResponse> callback)
+            throws TableStoreException, ClientException;
+
+    Future<DeleteTimeseriesAnalyticalStoreResponse> deleteTimeseriesAnalyticalStore(DeleteTimeseriesAnalyticalStoreRequest request,
+                                                                                    TableStoreCallback<DeleteTimeseriesAnalyticalStoreRequest, DeleteTimeseriesAnalyticalStoreResponse> callback)
+            throws TableStoreException, ClientException;
+
+    Future<DescribeTimeseriesAnalyticalStoreResponse> describeTimeseriesAnalyticalStore(DescribeTimeseriesAnalyticalStoreRequest request,
+                                                                                        TableStoreCallback<DescribeTimeseriesAnalyticalStoreRequest, DescribeTimeseriesAnalyticalStoreResponse> callback)
+            throws TableStoreException, ClientException;
+
+    Future<UpdateTimeseriesAnalyticalStoreResponse> updateTimeseriesAnalyticalStore(UpdateTimeseriesAnalyticalStoreRequest request,
+                                                                                    TableStoreCallback<UpdateTimeseriesAnalyticalStoreRequest, UpdateTimeseriesAnalyticalStoreResponse> callback)
+            throws TableStoreException, ClientException;
+
     public TimeseriesClientInterface asTimeseriesClientInterface();
 
     /**

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

@@ -1800,6 +1800,110 @@ public Future<ScanTimeseriesDataResponse> scanTimeseriesData(
         return f;
     }
 
+    public Future<CreateTimeseriesAnalyticalStoreResponse> createTimeseriesAnalyticalStore(
+            CreateTimeseriesAnalyticalStoreRequest request,
+            TableStoreCallback<CreateTimeseriesAnalyticalStoreRequest, CreateTimeseriesAnalyticalStoreResponse> callback) {
+        Preconditions.checkNotNull(request);
+
+        TraceLogger tracer = getTraceLogger();
+        RetryStrategy retry = this.retryStrategy.clone();
+        CreateTimeseriesAnalyticalStoreLauncher launcher = launcherFactory.createTimeseriesAnalyticalStore(tracer, retry, request);
+
+        AsyncCompletion<CreateTimeseriesAnalyticalStoreRequest, CreateTimeseriesAnalyticalStoreResponse> completion =
+                new AsyncCompletion<CreateTimeseriesAnalyticalStoreRequest, CreateTimeseriesAnalyticalStoreResponse>(
+                        launcher, request, tracer, callbackExecutor, retry, retryExecutor);
+        CallbackImpledFuture<CreateTimeseriesAnalyticalStoreRequest, CreateTimeseriesAnalyticalStoreResponse> f =
+                new CallbackImpledFuture<CreateTimeseriesAnalyticalStoreRequest, CreateTimeseriesAnalyticalStoreResponse>();
+        completion.watchBy(f);
+        if (callback != null) {
+            // user callback must be triggered after completion of the return
+            // future.
+            f.watchBy(callback);
+        }
+
+        launcher.fire(request, completion);
+
+        return f;
+    }
+
+    public Future<DeleteTimeseriesAnalyticalStoreResponse> deleteTimeseriesAnalyticalStore(
+            DeleteTimeseriesAnalyticalStoreRequest request,
+            TableStoreCallback<DeleteTimeseriesAnalyticalStoreRequest, DeleteTimeseriesAnalyticalStoreResponse> callback) {
+        Preconditions.checkNotNull(request);
+
+        TraceLogger tracer = getTraceLogger();
+        RetryStrategy retry = this.retryStrategy.clone();
+        DeleteTimeseriesAnalyticalStoreLauncher launcher = launcherFactory.deleteTimeseriesAnalyticalStore(tracer, retry, request);
+
+        AsyncCompletion<DeleteTimeseriesAnalyticalStoreRequest, DeleteTimeseriesAnalyticalStoreResponse> completion =
+                new AsyncCompletion<DeleteTimeseriesAnalyticalStoreRequest, DeleteTimeseriesAnalyticalStoreResponse>(
+                        launcher, request, tracer, callbackExecutor, retry, retryExecutor);
+        CallbackImpledFuture<DeleteTimeseriesAnalyticalStoreRequest, DeleteTimeseriesAnalyticalStoreResponse> f =
+                new CallbackImpledFuture<DeleteTimeseriesAnalyticalStoreRequest, DeleteTimeseriesAnalyticalStoreResponse>();
+        completion.watchBy(f);
+        if (callback != null) {
+            // user callback must be triggered after completion of the return
+            // future.
+            f.watchBy(callback);
+        }
+
+        launcher.fire(request, completion);
+
+        return f;
+    }
+
+    public Future<DescribeTimeseriesAnalyticalStoreResponse> describeTimeseriesAnalyticalStore(
+            DescribeTimeseriesAnalyticalStoreRequest request,
+            TableStoreCallback<DescribeTimeseriesAnalyticalStoreRequest, DescribeTimeseriesAnalyticalStoreResponse> callback) {
+        Preconditions.checkNotNull(request);
+
+        TraceLogger tracer = getTraceLogger();
+        RetryStrategy retry = this.retryStrategy.clone();
+        DescribeTimeseriesAnalyticalStoreLauncher launcher = launcherFactory.describeTimeseriesAnalyticalStore(tracer, retry, request);
+
+        AsyncCompletion<DescribeTimeseriesAnalyticalStoreRequest, DescribeTimeseriesAnalyticalStoreResponse> completion =
+                new AsyncCompletion<DescribeTimeseriesAnalyticalStoreRequest, DescribeTimeseriesAnalyticalStoreResponse>(
+                        launcher, request, tracer, callbackExecutor, retry, retryExecutor);
+        CallbackImpledFuture<DescribeTimeseriesAnalyticalStoreRequest, DescribeTimeseriesAnalyticalStoreResponse> f =
+                new CallbackImpledFuture<DescribeTimeseriesAnalyticalStoreRequest, DescribeTimeseriesAnalyticalStoreResponse>();
+        completion.watchBy(f);
+        if (callback != null) {
+            // user callback must be triggered after completion of the return
+            // future.
+            f.watchBy(callback);
+        }
+
+        launcher.fire(request, completion);
+
+        return f;
+    }
+
+    public Future<UpdateTimeseriesAnalyticalStoreResponse> updateTimeseriesAnalyticalStore(
+            UpdateTimeseriesAnalyticalStoreRequest request,
+            TableStoreCallback<UpdateTimeseriesAnalyticalStoreRequest, UpdateTimeseriesAnalyticalStoreResponse> callback) {
+        Preconditions.checkNotNull(request);
+
+        TraceLogger tracer = getTraceLogger();
+        RetryStrategy retry = this.retryStrategy.clone();
+        UpdateTimeseriesAnalyticalStoreLauncher launcher = launcherFactory.updateTimeseriesAnalyticalStore(tracer, retry, request);
+
+        AsyncCompletion<UpdateTimeseriesAnalyticalStoreRequest, UpdateTimeseriesAnalyticalStoreResponse> completion =
+                new AsyncCompletion<UpdateTimeseriesAnalyticalStoreRequest, UpdateTimeseriesAnalyticalStoreResponse>(
+                        launcher, request, tracer, callbackExecutor, retry, retryExecutor);
+        CallbackImpledFuture<UpdateTimeseriesAnalyticalStoreRequest, UpdateTimeseriesAnalyticalStoreResponse> f =
+                new CallbackImpledFuture<UpdateTimeseriesAnalyticalStoreRequest, UpdateTimeseriesAnalyticalStoreResponse>();
+        completion.watchBy(f);
+        if (callback != null) {
+            // user callback must be triggered after completion of the return
+            // future.
+            f.watchBy(callback);
+        }
+
+        launcher.fire(request, completion);
+
+        return f;
+    }
+
     public void setCredentials(ServiceCredentials credentials) {
         CredentialsProvider newCrdsProvider = CredentialsProviderFactory.newDefaultCredentialProvider(credentials.getAccessKeyId(),
                 credentials.getAccessKeySecret(), credentials.getSecurityToken());

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

@@ -205,6 +205,34 @@ public ScanTimeseriesDataResponse scanTimeseriesData(ScanTimeseriesDataRequest r
         return waitForFuture(resp);
     }
 
+    @Override
+    public CreateTimeseriesAnalyticalStoreResponse createTimeseriesAnalyticalStore(CreateTimeseriesAnalyticalStoreRequest request)
+            throws TableStoreException, ClientException {
+        Future<CreateTimeseriesAnalyticalStoreResponse> resp = internalClient.createTimeseriesAnalyticalStore(request, null);
+        return waitForFuture(resp);
+    }
+
+    @Override
+    public DeleteTimeseriesAnalyticalStoreResponse deleteTimeseriesAnalyticalStore(DeleteTimeseriesAnalyticalStoreRequest request)
+            throws TableStoreException, ClientException {
+        Future<DeleteTimeseriesAnalyticalStoreResponse> resp = internalClient.deleteTimeseriesAnalyticalStore(request, null);
+        return waitForFuture(resp);
+    }
+
+    @Override
+    public DescribeTimeseriesAnalyticalStoreResponse describeTimeseriesAnalyticalStore(DescribeTimeseriesAnalyticalStoreRequest request)
+            throws TableStoreException, ClientException {
+        Future<DescribeTimeseriesAnalyticalStoreResponse> resp = internalClient.describeTimeseriesAnalyticalStore(request, null);
+        return waitForFuture(resp);
+    }
+
+    @Override
+    public UpdateTimeseriesAnalyticalStoreResponse updateTimeseriesAnalyticalStore(UpdateTimeseriesAnalyticalStoreRequest request)
+            throws TableStoreException, ClientException {
+        Future<UpdateTimeseriesAnalyticalStoreResponse> resp = internalClient.updateTimeseriesAnalyticalStore(request, null);
+        return waitForFuture(resp);
+    }
+
     private <Res> Res waitForFuture(Future<Res> f) {
         try {
             return f.get(this.internalClient.getClientConfig().getSyncClientWaitFutureTimeoutInMillis(), TimeUnit.MILLISECONDS);

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

@@ -34,4 +34,16 @@ SplitTimeseriesScanTaskResponse splitTimeseriesScanTask(SplitTimeseriesScanTaskR
 
     ScanTimeseriesDataResponse scanTimeseriesData(ScanTimeseriesDataRequest request)
             throws TableStoreException, ClientException;
+
+    CreateTimeseriesAnalyticalStoreResponse createTimeseriesAnalyticalStore(CreateTimeseriesAnalyticalStoreRequest request)
+            throws TableStoreException, ClientException;
+
+    DeleteTimeseriesAnalyticalStoreResponse deleteTimeseriesAnalyticalStore(DeleteTimeseriesAnalyticalStoreRequest request)
+            throws TableStoreException, ClientException;
+
+    DescribeTimeseriesAnalyticalStoreResponse describeTimeseriesAnalyticalStore(DescribeTimeseriesAnalyticalStoreRequest request)
+            throws TableStoreException, ClientException;
+
+    UpdateTimeseriesAnalyticalStoreResponse updateTimeseriesAnalyticalStore(UpdateTimeseriesAnalyticalStoreRequest request)
+            throws TableStoreException, ClientException;
 }

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.13.15";
+    public static final String USER_AGENT = "ots-java-sdk 5.15.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/CreateTimeseriesAnalyticalStoreLauncher.java

@@ -0,0 +1,60 @@
+package com.alicloud.openservices.tablestore.core;
+
+import com.alicloud.openservices.tablestore.ClientConfiguration;
+import com.alicloud.openservices.tablestore.core.auth.CredentialsProvider;
+import com.alicloud.openservices.tablestore.core.http.AsyncServiceClient;
+import com.alicloud.openservices.tablestore.core.http.CreateTimeseriesAnalyticalStoreResponseConsumer;
+import com.alicloud.openservices.tablestore.core.http.OTSUri;
+import com.alicloud.openservices.tablestore.core.protocol.ResultParserFactory;
+import com.alicloud.openservices.tablestore.core.protocol.timeseries.Timeseries;
+import com.alicloud.openservices.tablestore.core.protocol.timeseries.TimeseriesProtocolBuilder;
+import com.alicloud.openservices.tablestore.core.utils.LogUtil;
+import com.alicloud.openservices.tablestore.core.utils.Preconditions;
+import com.alicloud.openservices.tablestore.model.RetryStrategy;
+import com.alicloud.openservices.tablestore.model.timeseries.CreateTimeseriesAnalyticalStoreRequest;
+import com.alicloud.openservices.tablestore.model.timeseries.CreateTimeseriesAnalyticalStoreResponse;
+import org.apache.http.concurrent.FutureCallback;
+
+public class CreateTimeseriesAnalyticalStoreLauncher extends OperationLauncher<CreateTimeseriesAnalyticalStoreRequest, CreateTimeseriesAnalyticalStoreResponse> {
+
+    private OTSUri uri;
+    private TraceLogger tracer;
+    private RetryStrategy retry;
+
+    public CreateTimeseriesAnalyticalStoreLauncher(
+            OTSUri uri,
+            TraceLogger tracer,
+            RetryStrategy retry,
+            String instanceName,
+            AsyncServiceClient client,
+            CredentialsProvider crdsProvider,
+            ClientConfiguration config,
+            CreateTimeseriesAnalyticalStoreRequest originRequest) {
+        super(instanceName, client, crdsProvider, config, originRequest);
+        Preconditions.checkNotNull(uri);
+        Preconditions.checkNotNull(tracer);
+        Preconditions.checkNotNull(retry);
+
+        this.uri = uri;
+        this.tracer = tracer;
+        this.retry = retry;
+    }
+
+    @Override
+    public void fire(CreateTimeseriesAnalyticalStoreRequest request, FutureCallback<CreateTimeseriesAnalyticalStoreResponse> cb) {
+        LogUtil.logBeforeExecution(tracer, retry);
+
+        Timeseries.CreateTimeseriesAnalyticalStoreResponse defaultResponse =
+                Timeseries.CreateTimeseriesAnalyticalStoreResponse.getDefaultInstance();
+        asyncInvokePost(
+                uri,
+                null,
+                TimeseriesProtocolBuilder.buildCreateTimeseriesAnalyticalStoreRequest(request),
+                tracer,
+                new CreateTimeseriesAnalyticalStoreResponseConsumer(
+                        ResultParserFactory.createFactory().createProtocolBufferResultParser(
+                                defaultResponse, tracer.getTraceId()),
+                        tracer, retry, lastResult),
+                cb);
+    }
+}