Skip to content

Commit 8364cca

Browse files
author
修杰
committed
Merge 'integration_2025-04-28_881148411650' into 'master'
merge branch integration_2025-04-28_881148411650 into master See merge request: !465
2 parents 7b87983 + 8ad7044 commit 8364cca

File tree

268 files changed

+34316
-230
lines changed

Some content is hidden

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

268 files changed

+34316
-230
lines changed

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* Note
99

1010
### Requirements ###
11+
1112
运行 SDK需要jdk **Java 1.8.0_131+**. 你可以下载最新的版本： http://developers.sun.com/downloads/.
1213
如果 SDK版本 高于或者等于 **Java 9** 请依赖javax.annotation-api
1314
由于在高于或者等于 **Java 9** 中 javax.annotation-api 被移除
@@ -61,7 +62,7 @@
6162
<dependency>
6263
<groupId>com.volcengine</groupId>
6364
<artifactId>volcengine-java-sdk-bom</artifactId>
64-
<version>0.2.5</version>
65+
<version>0.2.6</version>
6566
<type>pom</type>
6667
<scope>import</scope>
6768
</dependency>
@@ -77,12 +78,12 @@
7778
<dependency>
7879
<groupId>com.volcengine</groupId>
7980
<artifactId>volcengine-java-sdk-vpc</artifactId>
80-
<version>0.2.5</version>
81+
<version>0.2.6</version>
8182
</dependency>
8283
<dependency>
8384
<groupId>com.volcengine</groupId>
8485
<artifactId>volcengine-java-sdk-ecs</artifactId>
85-
<version>0.2.5</version>
86+
<version>0.2.6</version>
8687
</dependency>
8788
</dependencies>
8889
```

‎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.5",
3-
"meta_commit": "16bc2e75c0bb7f181f0f94f6144a503f8939fcbb"
2+
"lasted": "0.2.6",
3+
"meta_commit": "329851cfcec2044c71bfc167e9f7c3e11e29aa3a"
44
}

‎pom.xml

Lines changed: 2 additions & 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.5</version>
7+
<version>0.2.6</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>
@@ -277,5 +277,6 @@
277277
<module>volcengine-java-sdk-wafruntime</module>
278278
<module>volcengine-java-sdk-volccontentplatform</module>
279279
<module>volcengine-java-sdk-mlplatform20240701</module>
280+
<module>volcengine-java-sdk-vod20250101</module>
280281
</modules>
281282
</project>

‎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.5</version>
6+
<version>0.2.6</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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-alb/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-ark-runtime/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<build>

‎volcengine-java-sdk-ark/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-autoscaling/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-billing/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-bio/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-bom/pom.xml

Lines changed: 7 additions & 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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
@@ -427,6 +427,12 @@
427427
<optional>false</optional>
428428
<version>${project.version}</version>
429429
</dependency>
430+
<dependency>
431+
<groupId>com.volcengine</groupId>
432+
<artifactId>volcengine-java-sdk-vod20250101</artifactId>
433+
<optional>false</optional>
434+
<version>${project.version}</version>
435+
</dependency>
430436
</dependencies>
431437
</dependencyManagement>
432438
</project>

‎volcengine-java-sdk-cdn/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-cen/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-certificateservice/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-clb/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-clouddetect/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-cloudtrail/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-cloudtrail20180101/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.5</version>
6+
<version>0.2.6</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-core/pom.xml

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

‎volcengine-java-sdk-core/src/main/java/com/volcengine/ApiClient.java

Lines changed: 57 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,15 @@ public class ApiClient {
101101

102102
private Integer keepAliveDurationMs = 5 * 60 * 1000;
103103

104+
private Set<String> customBootstrapRegion;
105+
106+
private Boolean useDualStack;
104107

105108
/*
106109
* Constructor for ApiClient
107110
*/
108111
public ApiClient() {
109-
ConnectionPool connectionPool=new ConnectionPool(maxIdleConns,keepAliveDurationMs);
112+
ConnectionPool connectionPool = new ConnectionPool(maxIdleConns, keepAliveDurationMs);
110113
httpClient = new OkHttpClient();
111114
httpClient.setConnectionPool(connectionPool);
112115

@@ -147,6 +150,17 @@ private static String getUserAgent() {
147150
return String.format(format, Version.SDK_NAME, Version.SDK_VERSION, jdkInfo, osInfo, arch);
148151
}
149152

153+
/**
154+
* Set the User-Agent header's value (by adding to the default header map).
155+
*
156+
* @param userAgent HTTP request's user agent
157+
* @return ApiClient
158+
*/
159+
public ApiClient setUserAgent(String userAgent) {
160+
addDefaultHeader("User-Agent", userAgent);
161+
return this;
162+
}
163+
150164
/**
151165
* Get base path
152166
*
@@ -237,7 +251,6 @@ public ApiClient setCredentials(Credentials credentials) {
237251
return this;
238252
}
239253

240-
241254
/**
242255
* Get HTTP client
243256
*
@@ -388,18 +401,6 @@ public Authentication getAuthentication(String authName) {
388401
return authentications.get(authName);
389402
}
390403

391-
392-
/**
393-
* Set the User-Agent header's value (by adding to the default header map).
394-
*
395-
* @param userAgent HTTP request's user agent
396-
* @return ApiClient
397-
*/
398-
public ApiClient setUserAgent(String userAgent) {
399-
addDefaultHeader("User-Agent", userAgent);
400-
return this;
401-
}
402-
403404
/**
404405
* Add a default header.
405406
*
@@ -530,6 +531,46 @@ public ApiClient setWriteTimeout(int writeTimeout) {
530531
return this;
531532
}
532533

534+
/**
535+
* Get the custom bootstrapping regions.
536+
*
537+
* @return Set of custom bootstrapping regions
538+
*/
539+
public Set<String> getCustomBootstrapRegion() {
540+
return this.customBootstrapRegion;
541+
}
542+
543+
/**
544+
* Set the custom bootstrapping regions.
545+
*
546+
* @param customBootstrapRegion Set of custom bootstrapping regions
547+
* @return Api client
548+
*/
549+
public ApiClient setCustomBootstrapRegion(Set<String> customBootstrapRegion) {
550+
this.customBootstrapRegion = customBootstrapRegion;
551+
return this;
552+
}
553+
554+
/**
555+
* Get the use dual stack flag.
556+
*
557+
* @return use dual stack flag
558+
*/
559+
public Boolean getUseDualStack() {
560+
return this.useDualStack;
561+
}
562+
563+
/**
564+
* Set the use dual stack flag.
565+
*
566+
* @param useDualStack boolean
567+
* @return Api client
568+
*/
569+
public ApiClient setUseDualStack(boolean useDualStack) {
570+
this.useDualStack = useDualStack;
571+
return this;
572+
}
573+
533574
/**
534575
* Format the given parameter object into string.
535576
*
@@ -1656,7 +1697,7 @@ public Integer getMaxIdleConns() {
16561697

16571698
public ApiClient setMaxIdleConns(Integer maxIdleConns) {
16581699
this.maxIdleConns = maxIdleConns;
1659-
this.httpClient.setConnectionPool(new ConnectionPool(maxIdleConns,keepAliveDurationMs));
1700+
this.httpClient.setConnectionPool(new ConnectionPool(maxIdleConns, keepAliveDurationMs));
16601701
return this;
16611702
}
16621703

@@ -1666,7 +1707,7 @@ public Integer getKeepAliveDurationMs() {
16661707

16671708
public ApiClient setKeepAliveDurationMs(Integer keepAliveDurationMs) {
16681709
this.keepAliveDurationMs = keepAliveDurationMs;
1669-
this.httpClient.setConnectionPool(new ConnectionPool(maxIdleConns,keepAliveDurationMs));
1710+
this.httpClient.setConnectionPool(new ConnectionPool(maxIdleConns, keepAliveDurationMs));
16701711
return this;
16711712
}
16721713
}

0 commit comments

Comments
 (0)