Skip to content

Commit be2f1ea

Browse files
liuweiwei-xyzliuweiwei-xyz
committed
Merge branch 'integration_2024-05-30_272976241922' into 'master'
merge branch integration_2024-05-30_272976241922 into master See merge request iaasng/volcengine-java-sdk!180
2 parents cb5adc5 + 48ef625 commit be2f1ea

File tree

756 files changed

+111194
-183
lines changed

Some content is hidden

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

756 files changed

+111194
-183
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
.idea/
22
bin/
33
vendor/
4+
target/
45
output_result
56
*.log
67
*.class
7-
*.lst
8+
*.lst
9+
*.iml

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.volcengine</groupId>
5656
<artifactId>volcengine-java-sdk-bom</artifactId>
57-
<version>0.1.111</version>
57+
<version>0.1.112</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
@@ -70,12 +70,12 @@
7070
<dependency>
7171
<groupId>com.volcengine</groupId>
7272
<artifactId>volcengine-java-sdk-vpc</artifactId>
73-
<version>0.1.111</version>
73+
<version>0.1.112</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.volcengine</groupId>
7777
<artifactId>volcengine-java-sdk-ecs</artifactId>
78-
<version>0.1.111</version>
78+
<version>0.1.112</version>
7979
</dependency>
8080
</dependencies>
8181
```

‎meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "0.1.111",
3-
"meta_commit": "5fd5abe88c8676dfeae2a125bc9f6e20707ca271"
2+
"lasted": "0.1.112",
3+
"meta_commit": "c702a599927b941e63146a039046b2384fdf944e"
44
}

‎pom.xml‎

Lines changed: 3 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.1.111</version>
7+
<version>0.1.112</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>
@@ -239,5 +239,7 @@
239239
<module>volcengine-java-sdk-dcdn</module>
240240
<module>volcengine-java-sdk-organization</module>
241241
<module>volcengine-java-sdk-ark</module>
242+
<module>volcengine-java-sdk-ark-runtime</module>
243+
<module>volcengine-java-sdk-cdn</module>
242244
</modules>
243245
</project>

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

‎volcengine-java-sdk-ark-runtime/pom.xml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<parent>
4+
<artifactId>volcengine-java-sdk</artifactId>
5+
<groupId>com.volcengine</groupId>
6+
<version>0.1.112</version>
7+
<relativePath>../pom.xml</relativePath>
8+
</parent>
9+
<build>
10+
<plugins>
11+
<plugin>
12+
<groupId>org.apache.maven.plugins</groupId>
13+
<artifactId>maven-compiler-plugin</artifactId>
14+
<configuration>
15+
<source>8</source>
16+
<target>8</target>
17+
</configuration>
18+
</plugin>
19+
</plugins>
20+
</build>
21+
<modelVersion>4.0.0</modelVersion>
22+
<artifactId>volcengine-java-sdk-ark-runtime</artifactId>
23+
<properties>
24+
<jackson.version>2.12.7.1</jackson.version>
25+
<retrofit.version>2.9.0</retrofit.version>
26+
<rxjava2.version>2.0.0</rxjava2.version>
27+
<okhttp3-version>3.14.9</okhttp3-version>
28+
</properties>
29+
<dependencies>
30+
<dependency>
31+
<groupId>com.volcengine</groupId>
32+
<artifactId>volcengine-java-sdk-ark</artifactId>
33+
<version>${project.version}</version>
34+
<exclusions>
35+
<exclusion>
36+
<artifactId>okio</artifactId>
37+
<groupId>com.squareup.okio</groupId>
38+
</exclusion>
39+
</exclusions>
40+
</dependency>
41+
<dependency>
42+
<groupId>com.fasterxml.jackson.core</groupId>
43+
<artifactId>jackson-databind</artifactId>
44+
<version>${jackson.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.squareup.retrofit2</groupId>
48+
<artifactId>retrofit</artifactId>
49+
<version>${retrofit.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.reactivex.rxjava2</groupId>
53+
<artifactId>rxjava</artifactId>
54+
<version>${rxjava2.version}</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.squareup.retrofit2</groupId>
58+
<artifactId>adapter-rxjava2</artifactId>
59+
<version>${retrofit.version}</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>com.squareup.retrofit2</groupId>
63+
<artifactId>converter-jackson</artifactId>
64+
<version>${retrofit.version}</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>com.squareup.okhttp3</groupId>
68+
<artifactId>okhttp</artifactId>
69+
<version>${okhttp3-version}</version>
70+
</dependency>
71+
</dependencies>
72+
</project>

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/Const.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.volcengine.ark.runtime;
2+
3+
public class Const {
4+
5+
public static final String ACCESS_KEY = "VOLC_ACCESSKEY";
6+
public static final String SECRET_KEY = "VOLC_SECRETKEY";
7+
public static final String CLIENT_REQUEST_HEADER = "X-Client-Request-Id";
8+
public static final String SERVER_REQUEST_HEADER = "X-Request-Id";
9+
public static final String REQUEST_MODEL = "X-Request-Model";
10+
public static final Integer DEFAULT_MANDATORY_REFRESH_TIMEOUT = 10 * 60; // 10 min
11+
public static final Integer DEFAULT_ADVISORY_REFRESH_TIMEOUT = 30 * 60; // 30 min
12+
public static final Integer DEFAULT_STS_TIMEOUT = 7 * 24 * 60 * 60; // 7 days
13+
}

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/SSEFormatException.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.volcengine.ark.runtime;
2+
3+
/**
4+
* Exception indicating a SSE format error
5+
*/
6+
public class SSEFormatException extends Throwable{
7+
public SSEFormatException(String msg){
8+
super(msg);
9+
}
10+
}

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/exception/ArkAPIError.java‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
package com.volcengine.ark.runtime.exception;
2+
3+
4+
public class ArkAPIError {
5+
6+
ArkErrorDetails error;
7+
8+
public ArkAPIError(ArkErrorDetails error) {
9+
this.error = error;
10+
}
11+
12+
public ArkAPIError() {}
13+
14+
public ArkErrorDetails getError() {
15+
return error;
16+
}
17+
18+
public void setError(ArkErrorDetails error) {
19+
this.error = error;
20+
}
21+
22+
@Override
23+
public String toString() {
24+
return "ArkAPIError{" +
25+
"error=" + error +
26+
'}';
27+
}
28+
29+
public static class ArkErrorDetails {
30+
31+
String message;
32+
33+
String type;
34+
35+
String param;
36+
37+
String code;
38+
39+
public ArkErrorDetails(String message, String type, String param, String code) {
40+
this.message = message;
41+
this.type = type;
42+
this.param = param;
43+
this.code = code;
44+
}
45+
46+
public ArkErrorDetails(){}
47+
48+
public String getMessage() {
49+
return message;
50+
}
51+
52+
public void setMessage(String message) {
53+
this.message = message;
54+
}
55+
56+
public String getType() {
57+
return type;
58+
}
59+
60+
public void setType(String type) {
61+
this.type = type;
62+
}
63+
64+
public String getParam() {
65+
return param;
66+
}
67+
68+
public void setParam(String param) {
69+
this.param = param;
70+
}
71+
72+
public String getCode() {
73+
return code;
74+
}
75+
76+
public void setCode(String code) {
77+
this.code = code;
78+
}
79+
80+
@Override
81+
public String toString() {
82+
return "ArkErrorDetails{" +
83+
"message='" + message + '\'' +
84+
", type='" + type + '\'' +
85+
", param='" + param + '\'' +
86+
", code='" + code + '\'' +
87+
'}';
88+
}
89+
}
90+
}

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/exception/ArkException.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.volcengine.ark.runtime.exception;
2+
3+
public class ArkException extends RuntimeException {
4+
public ArkException(String msg) {
5+
super(msg);
6+
}
7+
8+
}

0 commit comments

Comments
 (0)