Skip to content

Commit a51eb10

Browse files
committed
Merge remote-tracking branch 'origin/master' into dev-aicc
# Conflicts: # volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/interceptor/EncryptionInterceptor.java # volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/utils/KeyAgreementUtil.java
2 parents 67adced + f039aec commit a51eb10

File tree

551 files changed

+25411
-17053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

551 files changed

+25411
-17053
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>com.volcengine</groupId>
6464
<artifactId>volcengine-java-sdk-bom</artifactId>
65-
<version>0.2.44</version>
65+
<version>0.2.45</version>
6666
<type>pom</type>
6767
<scope>import</scope>
6868
</dependency>
@@ -78,12 +78,12 @@
7878
<dependency>
7979
<groupId>com.volcengine</groupId>
8080
<artifactId>volcengine-java-sdk-vpc</artifactId>
81-
<version>0.2.44</version>
81+
<version>0.2.45</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>com.volcengine</groupId>
8585
<artifactId>volcengine-java-sdk-ecs</artifactId>
86-
<version>0.2.44</version>
86+
<version>0.2.45</version>
8787
</dependency>
8888
</dependencies>
8989
```

meta.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "0.2.44",
3-
"meta_commit": "b229807a6a5b8d929845552059eb5b3f3a4fb985"
2+
"lasted": "0.2.45",
3+
"meta_commit": "b5b32ebd64a9c2d240652d54a38a9ceb2bdc10bd"
44
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.volcengine</groupId>
55
<artifactId>volcengine-java-sdk</artifactId>
66
<packaging>pom</packaging>
7-
<version>0.2.44</version>
7+
<version>0.2.45</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>

volcengine-java-sdk-acep/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.2.44</version>
6+
<version>0.2.45</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-advdefence/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.2.44</version>
6+
<version>0.2.45</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-advdefence20230308/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.2.44</version>
6+
<version>0.2.45</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-aiotvideo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.2.44</version>
6+
<version>0.2.45</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-aiotvideo/src/main/java/com/volcengine/aiotvideo/AiotvideoApi.java

Lines changed: 749 additions & 371 deletions
Large diffs are not rendered by default.
Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
/*
2+
* aiotvideo
3+
* No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
4+
*
5+
* OpenAPI spec version: common-version
6+
*
7+
*
8+
* NOTE: This class is auto generated by the swagger code generator program.
9+
* https://github.com/swagger-api/swagger-codegen.git
10+
* Do not edit the class manually.
11+
*/
12+
13+
package com.volcengine.aiotvideo.model;
14+
15+
import java.util.Objects;
16+
import java.util.Arrays;
17+
import com.google.gson.TypeAdapter;
18+
import com.google.gson.annotations.JsonAdapter;
19+
import com.google.gson.annotations.SerializedName;
20+
import com.google.gson.stream.JsonReader;
21+
import com.google.gson.stream.JsonWriter;
22+
import io.swagger.v3.oas.annotations.media.Schema;
23+
import java.io.IOException;
24+
import javax.validation.constraints.*;
25+
import javax.validation.Valid;
26+
/**
27+
* AIForGetSpaceTemplateOutput
28+
*/
29+
30+
31+
32+
public class AIForGetSpaceTemplateOutput {
33+
@SerializedName("BindTime")
34+
private String bindTime = null;
35+
36+
@SerializedName("TemplateID")
37+
private String templateID = null;
38+
39+
@SerializedName("TemplateName")
40+
private String templateName = null;
41+
42+
public AIForGetSpaceTemplateOutput bindTime(String bindTime) {
43+
this.bindTime = bindTime;
44+
return this;
45+
}
46+
47+
/**
48+
* Get bindTime
49+
* @return bindTime
50+
**/
51+
@Schema(description = "")
52+
public String getBindTime() {
53+
return bindTime;
54+
}
55+
56+
public void setBindTime(String bindTime) {
57+
this.bindTime = bindTime;
58+
}
59+
60+
public AIForGetSpaceTemplateOutput templateID(String templateID) {
61+
this.templateID = templateID;
62+
return this;
63+
}
64+
65+
/**
66+
* Get templateID
67+
* @return templateID
68+
**/
69+
@Schema(description = "")
70+
public String getTemplateID() {
71+
return templateID;
72+
}
73+
74+
public void setTemplateID(String templateID) {
75+
this.templateID = templateID;
76+
}
77+
78+
public AIForGetSpaceTemplateOutput templateName(String templateName) {
79+
this.templateName = templateName;
80+
return this;
81+
}
82+
83+
/**
84+
* Get templateName
85+
* @return templateName
86+
**/
87+
@Schema(description = "")
88+
public String getTemplateName() {
89+
return templateName;
90+
}
91+
92+
public void setTemplateName(String templateName) {
93+
this.templateName = templateName;
94+
}
95+
96+
97+
@Override
98+
public boolean equals(java.lang.Object o) {
99+
if (this == o) {
100+
return true;
101+
}
102+
if (o == null || getClass() != o.getClass()) {
103+
return false;
104+
}
105+
AIForGetSpaceTemplateOutput aiForGetSpaceTemplateOutput = (AIForGetSpaceTemplateOutput) o;
106+
return Objects.equals(this.bindTime, aiForGetSpaceTemplateOutput.bindTime) &&
107+
Objects.equals(this.templateID, aiForGetSpaceTemplateOutput.templateID) &&
108+
Objects.equals(this.templateName, aiForGetSpaceTemplateOutput.templateName);
109+
}
110+
111+
@Override
112+
public int hashCode() {
113+
return Objects.hash(bindTime, templateID, templateName);
114+
}
115+
116+
117+
@Override
118+
public String toString() {
119+
StringBuilder sb = new StringBuilder();
120+
sb.append("class AIForGetSpaceTemplateOutput {\n");
121+
122+
sb.append(" bindTime: ").append(toIndentedString(bindTime)).append("\n");
123+
sb.append(" templateID: ").append(toIndentedString(templateID)).append("\n");
124+
sb.append(" templateName: ").append(toIndentedString(templateName)).append("\n");
125+
sb.append("}");
126+
return sb.toString();
127+
}
128+
129+
/**
130+
* Convert the given object to string with each line indented by 4 spaces
131+
* (except the first line).
132+
*/
133+
private String toIndentedString(java.lang.Object o) {
134+
if (o == null) {
135+
return "null";
136+
}
137+
return o.toString().replace("\n", "\n ");
138+
}
139+
140+
}

volcengine-java-sdk-aiotvideo/src/main/java/com/volcengine/aiotvideo/model/GenSipIDRequest.java renamed to volcengine-java-sdk-aiotvideo/src/main/java/com/volcengine/aiotvideo/model/CancelBindTemplateRequest.java

Lines changed: 29 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -24,74 +24,54 @@
2424
import javax.validation.constraints.*;
2525
import javax.validation.Valid;
2626
/**
27-
* GenSipIDRequest
27+
* CancelBindTemplateRequest
2828
*/
2929

3030

3131

32-
public class GenSipIDRequest {
33-
@SerializedName("DeviceType")
34-
private String deviceType = null;
35-
36-
@SerializedName("SipServerID")
37-
private String sipServerID = null;
38-
32+
public class CancelBindTemplateRequest {
3933
@SerializedName("SpaceID")
4034
private String spaceID = null;
4135

42-
public GenSipIDRequest deviceType(String deviceType) {
43-
this.deviceType = deviceType;
36+
@SerializedName("TemplateType")
37+
private String templateType = null;
38+
39+
public CancelBindTemplateRequest spaceID(String spaceID) {
40+
this.spaceID = spaceID;
4441
return this;
4542
}
4643

4744
/**
48-
* Get deviceType
49-
* @return deviceType
45+
* Get spaceID
46+
* @return spaceID
5047
**/
5148
@NotNull
5249
@Schema(required = true, description = "")
53-
public String getDeviceType() {
54-
return deviceType;
55-
}
56-
57-
public void setDeviceType(String deviceType) {
58-
this.deviceType = deviceType;
59-
}
60-
61-
public GenSipIDRequest sipServerID(String sipServerID) {
62-
this.sipServerID = sipServerID;
63-
return this;
64-
}
65-
66-
/**
67-
* Get sipServerID
68-
* @return sipServerID
69-
**/
70-
@Schema(description = "")
71-
public String getSipServerID() {
72-
return sipServerID;
50+
public String getSpaceID() {
51+
return spaceID;
7352
}
7453

75-
public void setSipServerID(String sipServerID) {
76-
this.sipServerID = sipServerID;
54+
public void setSpaceID(String spaceID) {
55+
this.spaceID = spaceID;
7756
}
7857

79-
public GenSipIDRequest spaceID(String spaceID) {
80-
this.spaceID = spaceID;
58+
public CancelBindTemplateRequest templateType(String templateType) {
59+
this.templateType = templateType;
8160
return this;
8261
}
8362

8463
/**
85-
* Get spaceID
86-
* @return spaceID
64+
* Get templateType
65+
* @return templateType
8766
**/
88-
@Schema(description = "")
89-
public String getSpaceID() {
90-
return spaceID;
67+
@NotNull
68+
@Schema(required = true, description = "")
69+
public String getTemplateType() {
70+
return templateType;
9171
}
9272

93-
public void setSpaceID(String spaceID) {
94-
this.spaceID = spaceID;
73+
public void setTemplateType(String templateType) {
74+
this.templateType = templateType;
9575
}
9676

9777

@@ -103,26 +83,24 @@ public boolean equals(java.lang.Object o) {
10383
if (o == null || getClass() != o.getClass()) {
10484
return false;
10585
}
106-
GenSipIDRequest genSipIDRequest = (GenSipIDRequest) o;
107-
return Objects.equals(this.deviceType, genSipIDRequest.deviceType) &&
108-
Objects.equals(this.sipServerID, genSipIDRequest.sipServerID) &&
109-
Objects.equals(this.spaceID, genSipIDRequest.spaceID);
86+
CancelBindTemplateRequest cancelBindTemplateRequest = (CancelBindTemplateRequest) o;
87+
return Objects.equals(this.spaceID, cancelBindTemplateRequest.spaceID) &&
88+
Objects.equals(this.templateType, cancelBindTemplateRequest.templateType);
11089
}
11190

11291
@Override
11392
public int hashCode() {
114-
return Objects.hash(deviceType, sipServerID, spaceID);
93+
return Objects.hash(spaceID, templateType);
11594
}
11695

11796

11897
@Override
11998
public String toString() {
12099
StringBuilder sb = new StringBuilder();
121-
sb.append("class GenSipIDRequest {\n");
100+
sb.append("class CancelBindTemplateRequest {\n");
122101

123-
sb.append(" deviceType: ").append(toIndentedString(deviceType)).append("\n");
124-
sb.append(" sipServerID: ").append(toIndentedString(sipServerID)).append("\n");
125102
sb.append(" spaceID: ").append(toIndentedString(spaceID)).append("\n");
103+
sb.append(" templateType: ").append(toIndentedString(templateType)).append("\n");
126104
sb.append("}");
127105
return sb.toString();
128106
}

0 commit comments

Comments
 (0)