Skip to content

Commit e2bdb67

Browse files
author
fengyikai
committed
Update SDK
1 parent 724d164 commit e2bdb67

391 files changed

Lines changed: 13403 additions & 12714 deletions

File tree

Some content is hidden

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

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ksyun</groupId>
88
<artifactId>ksyun-java-sdk</artifactId>
9-
<version>1.8.6</version>
9+
<version>1.8.6.1</version>
1010
<packaging>jar</packaging>
1111

1212
<name>KSYUN SDK for Java</name>

src/main/java/ksyun/client/vpc/acceptvpcpeeringconnection.v20160304/AcceptVpcPeeringConnectionClient.java

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import java.util.*;
1313

1414
/**
15-
* @Classname AcceptVpcPeeringConnectionClient
16-
* @Description 接受对等连接
17-
*/
15+
* @Classname AcceptVpcPeeringConnectionClient
16+
* @Description 接受对等连接
17+
*/
1818
@Slf4j
1919
public class AcceptVpcPeeringConnectionClient extends BaseClient {
2020
private final static String service = "vpc";
@@ -64,26 +64,26 @@ public AcceptVpcPeeringConnectionResponse doPost(String path, AcceptVpcPeeringCo
6464
}
6565

6666
/**
67-
* post 请求
68-
* @param path
69-
* @param requestObj
70-
* @return
71-
* @throws Exception
72-
*/
67+
* post 请求
68+
* @param path
69+
* @param requestObj
70+
* @return
71+
* @throws Exception
72+
*/
7373
public AcceptVpcPeeringConnectionResponse doPostRaw(String path, AcceptVpcPeeringConnectionRequest requestObj) throws Exception {
7474
Map<String, String> head = new HashMap<>();
7575
head.put("Content-Type", "application/x-www-form-urlencoded");
7676
return doPostRaw(path, requestObj, head);
7777
}
7878

7979
/**
80-
* post 请求
81-
*
82-
* @param path
83-
* @param requestObj
84-
* @return
85-
* @throws Exception
86-
*/
80+
* post 请求
81+
*
82+
* @param path
83+
* @param requestObj
84+
* @return
85+
* @throws Exception
86+
*/
8787
public AcceptVpcPeeringConnectionResponse doPostRaw(String path, AcceptVpcPeeringConnectionRequest requestObj, Map<String, String> head) throws Exception {
8888
final Map<String, String> requestHeaders = head != null ? new HashMap<>(head) : new HashMap<>();
8989
requestHeaders.putIfAbsent("Content-Type", "application/x-www-form-urlencoded");
@@ -104,21 +104,21 @@ public AcceptVpcPeeringConnectionResponse doGet(String path, AcceptVpcPeeringCon
104104
return doGet(path, requestObj, head);
105105
}
106106

107-
/**
108-
* get 请求
109-
*
110-
* @param path
111-
* @param requestObj
112-
* @param head
113-
* @return
114-
* @throws Exception
115-
*/
116-
public AcceptVpcPeeringConnectionResponse doGet(String path, AcceptVpcPeeringConnectionRequest requestObj, Map<String, String> head) throws Exception {
117-
final Map<String, String> requestHeaders = head != null ? new HashMap<>(head) : new HashMap<>();
118-
requestHeaders.putIfAbsent("Content-Type", "application/x-www-form-urlencoded");
119-
String response = doRpc(path, requestObj, requestHeaders, "get");
120-
return JSON.parseObject(response, AcceptVpcPeeringConnectionResponse.class);
121-
}
107+
/**
108+
* get 请求
109+
*
110+
* @param path
111+
* @param requestObj
112+
* @param head
113+
* @return
114+
* @throws Exception
115+
*/
116+
public AcceptVpcPeeringConnectionResponse doGet(String path, AcceptVpcPeeringConnectionRequest requestObj, Map<String, String> head) throws Exception {
117+
final Map<String, String> requestHeaders = head != null ? new HashMap<>(head) : new HashMap<>();
118+
requestHeaders.putIfAbsent("Content-Type", "application/x-www-form-urlencoded");
119+
String response = doRpc(path, requestObj, requestHeaders, "get");
120+
return JSON.parseObject(response, AcceptVpcPeeringConnectionResponse.class);
121+
}
122122

123123
/**
124124
* doDelete 请求
@@ -184,66 +184,66 @@ public AcceptVpcPeeringConnectionResponse doPut(String path, AcceptVpcPeeringCon
184184
/**
185185
* rpc
186186
*
187-
* @param path
188-
* @param requestObj
189-
* @param head
190-
* @return
191-
* @throws Exception
192-
*/
193-
private String doRpc(String path, AcceptVpcPeeringConnectionRequest requestObj, Map<String, String> head, String requestMethod) throws Exception {
194-
//断言
195-
Objects.requireNonNull(path, "path cannot be null");
196-
Objects.requireNonNull(requestObj, "requestObj cannot be null");
197-
Objects.requireNonNull(requestMethod, "requestMethod cannot be null");
198-
Objects.requireNonNull(head, "head cannot be null");
199-
200-
//请求上下文
201-
RpcRequestContentModel requestContentModel = RpcRequestContentModel.builder()
202-
.action(action)
203-
.version(version)
204-
.service(service)
205-
.region(credential.getRegion())
206-
.accessKeyId(credential.getSecretKey())
207-
.secretAccessKey(credential.getSignStr())
208-
.build();
209-
210-
// 根据内容类型设置请求体
211-
String contentType = head.getOrDefault("Content-Type", "application/x-www-form-urlencoded");
212-
JSONObject requestParam = getRequestParam(requestObj, contentType);
213-
214-
//uri
215-
path = path + "?Action=" + action + "&Version=" + version;
216-
217-
//发起请求
218-
String response = new RpcRequestClient(requestContentModel).beginRpcRequest(path, requestMethod, requestParam, head);
219-
log.info("doRpc end,path:{},params:{},head:{}", path, JSONObject.toJSON(requestParam), head);
220-
return response;
187+
* @param path
188+
* @param requestObj
189+
* @param head
190+
* @return
191+
* @throws Exception
192+
*/
193+
private String doRpc(String path, AcceptVpcPeeringConnectionRequest requestObj, Map<String, String> head, String requestMethod) throws Exception {
194+
//断言
195+
Objects.requireNonNull(path, "path cannot be null");
196+
Objects.requireNonNull(requestObj, "requestObj cannot be null");
197+
Objects.requireNonNull(requestMethod, "requestMethod cannot be null");
198+
Objects.requireNonNull(head, "head cannot be null");
199+
200+
//请求上下文
201+
RpcRequestContentModel requestContentModel = RpcRequestContentModel.builder()
202+
.action(action)
203+
.version(version)
204+
.service(service)
205+
.region(credential.getRegion())
206+
.accessKeyId(credential.getSecretKey())
207+
.secretAccessKey(credential.getSignStr())
208+
.build();
209+
210+
// 根据内容类型设置请求体
211+
String contentType = head.getOrDefault("Content-Type", "application/x-www-form-urlencoded");
212+
JSONObject requestParam = getRequestParam(requestObj, contentType);
213+
214+
//uri
215+
path = path + "?Action=" + action + "&Version=" + version;
216+
217+
//发起请求
218+
String response = new RpcRequestClient(requestContentModel).beginRpcRequest(path, requestMethod, requestParam, head);
219+
log.info("doRpc end,path:{},params:{},head:{}", path, JSONObject.toJSON(requestParam), head);
220+
return response;
221221

222-
}
222+
}
223223

224224

225-
private JSONObject getRequestParam(AcceptVpcPeeringConnectionRequest requestObj, String contentType) throws Exception {
226-
//请求参数
227-
if (contentType.equalsIgnoreCase("application/json")) {
228-
return getPostRawRequestParams(requestObj);
225+
private JSONObject getRequestParam(AcceptVpcPeeringConnectionRequest requestObj, String contentType) throws Exception {
226+
//请求参数
227+
if (contentType.equalsIgnoreCase("application/json")) {
228+
return getPostRawRequestParams(requestObj);
229+
}
230+
return getSimpleRequestParams(requestObj);
229231
}
230-
return getSimpleRequestParams(requestObj);
231-
}
232232

233233

234-
private JSONObject getSimpleRequestParams(AcceptVpcPeeringConnectionRequest requestObj) throws Exception {
235-
JSONObject requestParams = new JSONObject();
234+
private JSONObject getSimpleRequestParams(AcceptVpcPeeringConnectionRequest requestObj) throws Exception {
235+
JSONObject requestParams = new JSONObject();
236236

237-
//设置请求体请求参数
238-
setRequestField(requestObj, requestParams);
239-
return requestParams;
240-
}
237+
//设置请求体请求参数
238+
setRequestField(requestObj, requestParams);
239+
return requestParams;
240+
}
241241

242-
private JSONObject getPostRawRequestParams(AcceptVpcPeeringConnectionRequest requestObj) throws Exception {
243-
JSONObject requestParams = new JSONObject();
242+
private JSONObject getPostRawRequestParams(AcceptVpcPeeringConnectionRequest requestObj) throws Exception {
243+
JSONObject requestParams = new JSONObject();
244244

245-
//设置请求体请求参数
246-
setRequestFieldForPostRaw(requestObj, requestParams);
247-
return requestParams;
248-
}
245+
//设置请求体请求参数
246+
setRequestFieldForPostRaw(requestObj, requestParams);
247+
return requestParams;
248+
}
249249
}

src/main/java/ksyun/client/vpc/acceptvpcpeeringconnection.v20160304/AcceptVpcPeeringConnectionRequest.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
import java.util.Arrays;
1010

1111
/**
12-
* @Classname AcceptVpcPeeringConnectionRequest
13-
* @Description 请求参数
14-
*/
12+
* @Classname AcceptVpcPeeringConnectionRequest
13+
* @Description 请求参数
14+
*/
1515
@Data
16-
public class AcceptVpcPeeringConnectionRequest {
17-
/**
18-
* 对等连接的ID
19-
*/
20-
@KsYunField(name = "VpcPeeringConnectionId")
16+
public class AcceptVpcPeeringConnectionRequest{
17+
/**对等连接的ID*/
18+
@KsYunField(name="VpcPeeringConnectionId")
2119
private String VpcPeeringConnectionId;
2220

2321
}

src/main/java/ksyun/client/vpc/acceptvpcpeeringconnection.v20160304/AcceptVpcPeeringConnectionResponse.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import java.util.Set;
99

1010
/**
11-
* @Classname AcceptVpcPeeringConnectionResponse
12-
* @Description AcceptVpcPeeringConnection 返回体
13-
*/
11+
* @Classname AcceptVpcPeeringConnectionResponse
12+
* @Description AcceptVpcPeeringConnection 返回体
13+
*/
1414
@Data
1515
@ToString
1616
public class AcceptVpcPeeringConnectionResponse extends BaseResponseModel {

0 commit comments

Comments
 (0)