Skip to content

Commit 56e0379

Browse files
author
markjrzhang
committed
update metaInsight API
add ut code
1 parent d438b22 commit 56e0379

18 files changed

+306
-28
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.qcloud</groupId>
66
<artifactId>cos_api</artifactId>
7-
<version>5.6.219</version>
7+
<version>5.6.219.1</version>
88
<packaging>jar</packaging>
99
<name>cos-java-sdk</name>
1010
<description>java sdk for qcloud cos</description>

‎src/main/java/com/qcloud/cos/COS.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3246,6 +3246,8 @@ SelectObjectContentResult selectObjectContent(SelectObjectContentRequest selectR
32463246

32473247
ZipPreviewResponse zipPreview(ZipPreviewRequest request);
32483248

3249+
GoodsMattingResponse goodsMatting(GoodsMattingRequest customRequest);
3250+
32493251
CreateHLSPlayKeyResponse createHLSPlayKey(CreateHLSPlayKeyRequest customRequest);
32503252

32513253
GetHLSPlayKeyResponse getHLSPlayKey(GetHLSPlayKeyRequest customRequest);

‎src/main/java/com/qcloud/cos/COSClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5048,7 +5048,7 @@ public ZipPreviewResponse zipPreview(ZipPreviewRequest zipPreviewRequest) {
50485048
return invoke(request, new Unmarshallers.CICommonUnmarshaller<ZipPreviewResponse>(ZipPreviewResponse.class));
50495049
}
50505050

5051-
// @Override
5051+
// @Override
50525052
public GoodsMattingResponse goodsMatting(GoodsMattingRequest customRequest) {
50535053
CosHttpRequest<GoodsMattingRequest> request = createRequest(customRequest.getBucketName(), "/" + customRequest.getObjectKey(), customRequest, HttpMethodName.GET);
50545054
request.addParameter("ci-process","GoodsMatting");

‎src/main/java/com/qcloud/cos/demo/ci/CreateDatasetDemo.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.qcloud.cos.COSClient;
44
import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetRequest;
55
import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetResponse;
6+
import com.qcloud.cos.utils.CIJackson;
67
import com.qcloud.cos.utils.Jackson;
78

89
/**
@@ -24,17 +25,20 @@ public static void main(String[] args) {
2425
public static void createDataset(COSClient client) {
2526
CreateDatasetRequest request = new CreateDatasetRequest();
2627
request.setAppId("1251704708");
27-
// 设置数据集名称，同一个账户下唯一。命名规则如下： 长度为1~32字符。 只能包含小写英文字母，数字，短划线（-）。 必须以英文字母和数字开头。;是否必传：是
28-
request.setDatasetName("mark");
28+
// 设置数据集名称，同一个账户下唯一。命名规则如下： 长度为1~32字符。
29+
// 只能包含小写英文字母，数字，短划线（-）。 必须以英文字母和数字开头。
30+
// 是否必传：是
31+
request.setDatasetName("mark-face-search");
2932
// 设置数据集描述信息。长度为1~256个英文或中文字符，默认值为空。;是否必传：否
30-
request.setDescription("test");
33+
request.setDescription("demo");
3134
// 设置指模板，在建立元数据索引时，后端将根据模板来决定收集哪些元数据。
3235
// 每个模板都包含一个或多个算子，不同的算子表示不同的元数据。
3336
// 目前支持的模板： Official:DefaultEmptyId：默认为空的模板，表示不进行元数据的采集。
3437
// Official:COSBasicMeta：基础信息模板，包含 COS 文件基础元信息算子，表示采集 COS 文件的名称、类型、ACL等基础元信息数据。
3538
// Official:FaceSearch：人脸检索模板，包含人脸检索、COS 文件基础元信息算子。
3639
// Official:ImageSearch：图像检索模板，包含图像检索、COS 文件基础元信息算子。
37-
request.setTemplateId("Official:COSBasicMeta");
40+
request.setTemplateId("Official:FaceSearch");
41+
System.out.println(CIJackson.toJsonString(request));
3842
CreateDatasetResponse response = client.createDataset(request);
3943
System.out.println(Jackson.toJsonString(response));
4044
}

‎src/main/java/com/qcloud/cos/demo/ci/DeleteDatasetDemo.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import com.qcloud.cos.model.ciModel.metaInsight.DeleteDatasetResponse;
66
import com.qcloud.cos.utils.Jackson;
77

8-
import java.util.List;
9-
108
/**
119
* 删除数据集 详情见https://cloud.tencent.com/document/product/460/106157
1210
*/
@@ -25,7 +23,7 @@ public static void main(String[] args) {
2523
*/
2624
public static void deleteDataset(COSClient client) {
2725
DeleteDatasetRequest request = new DeleteDatasetRequest();
28-
request.setAppId("demo-1234567890");
26+
request.setAppId("1234567890");
2927
// 设置数据集名称，同一个账户下唯一。;是否必传：是
3028
request.setDatasetName("test");
3129

‎src/main/java/com/qcloud/cos/demo/ci/DescribeDatasetDemo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static void main(String[] args) {
2525
*/
2626
public static void describeDataset(COSClient client) {
2727
DescribeDatasetRequest request = new DescribeDatasetRequest();
28-
request.setAppId("demo-1234567890");
28+
request.setAppId("1234567890");
2929
request.setDatasetname("数据集名称");// 设置数据集名称，同一个账户下唯一。
3030

3131
DescribeDatasetResponse response = client.describeDataset(request);

‎src/main/java/com/qcloud/cos/http/DefaultCosHttpClient.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import com.qcloud.cos.Headers;
4141
import com.qcloud.cos.auth.COSCredentials;
4242
import com.qcloud.cos.auth.COSSigner;
43+
import com.qcloud.cos.internal.cihandler.HttpEntityEnclosingDelete;
4344
import com.qcloud.cos.region.Region;
4445
import com.qcloud.cos.event.ProgressInputStream;
4546
import com.qcloud.cos.event.ProgressListener;
@@ -232,7 +233,7 @@ private <X extends CosServiceRequest> HttpRequestBase buildHttpRequest(
232233
} else if (httpMethodName.equals(HttpMethodName.GET)) {
233234
httpRequestBase = new HttpGet();
234235
} else if (httpMethodName.equals(HttpMethodName.DELETE)) {
235-
httpRequestBase = new HttpDelete();
236+
httpRequestBase = new HttpEntityEnclosingDelete();
236237
} else if (httpMethodName.equals(HttpMethodName.POST)) {
237238
httpRequestBase = new HttpPost();
238239
} else if (httpMethodName.equals(HttpMethodName.HEAD)) {
@@ -291,6 +292,12 @@ private <X extends CosServiceRequest> HttpRequestBase buildHttpRequest(
291292
(HttpEntityEnclosingRequestBase) httpRequestBase;
292293
entityRequestBase.setEntity(reqEntity);
293294
}
295+
296+
if ( httpMethodName.equals(HttpMethodName.DELETE)){
297+
HttpEntityEnclosingRequestBase entityRequestBase =
298+
(HttpEntityEnclosingDelete) httpRequestBase;
299+
entityRequestBase.setEntity(reqEntity);
300+
}
294301
}
295302
httpRequestBase.setConfig(this.requestConfig);
296303
if (clientConfig.useBasicAuth()) {

‎src/main/java/com/qcloud/cos/internal/CIServiceRequest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class CIServiceRequest extends CosServiceRequest {
3030
private String bucketName;
3131
@XStreamAlias("RequestId")
3232
private String requestId;
33-
@XStreamOmitField
3433
private String appId;
3534

3635
public String getAppId() {

‎src/main/java/com/qcloud/cos/internal/cihandler/CICommonJsonResponseHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class CICommonJsonResponseHandler<T> {
1818

1919
public T getResponse(InputStream in, Class<T> tClass) throws IOException {
2020
String response = inputStreamToStringUsingBufferedReader(in);
21-
// System.out.println(response);
21+
System.out.println(response);
2222
ObjectMapper objectMapper = new ObjectMapper();
2323
objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE);
2424
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

‎src/main/java/com/qcloud/cos/internal/cihandler/HttpEntityEnclosingDelete.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.qcloud.cos.internal.cihandler;
2+
3+
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
4+
5+
import java.net.URI;
6+
7+
public class HttpEntityEnclosingDelete extends HttpEntityEnclosingRequestBase {
8+
public static final String METHOD_NAME = "DELETE";
9+
10+
public HttpEntityEnclosingDelete() {
11+
12+
}
13+
public HttpEntityEnclosingDelete(URI uri) {
14+
this.setURI(uri);
15+
}
16+
17+
public HttpEntityEnclosingDelete(String uri) {
18+
this.setURI(URI.create(uri));
19+
}
20+
21+
@Override
22+
public String getMethod() {
23+
return METHOD_NAME;
24+
}
25+
}

0 commit comments

Comments
 (0)