Skip to content

sdk: rolling update for 1.2.8-release #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2023
Merged

sdk: rolling update for 1.2.8-release #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.7-release
1.2.8-release
4 changes: 2 additions & 2 deletions examples/generic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions examples/uhost/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-uhost</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java</artifactId>
<packaging>pom</packaging>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
<modules>
<module>ucloud-sdk-java-common</module>
<module>ucloud-sdk-java-ipsecvpn</module>
Expand Down
4 changes: 2 additions & 2 deletions ucloud-sdk-java-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
Expand Down
4 changes: 3 additions & 1 deletion ucloud-sdk-java-common/src/main/java/cn/ucloud/common/client/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
import cn.ucloud.common.request.Request;
import cn.ucloud.common.response.Response;

public interface Client {
import java.io.Closeable;

public interface Client extends Closeable {
/**
* invoke api from request and response
*
Expand Down
6 changes: 6 additions & 0 deletions ucloud-sdk-java-common/src/main/java/cn/ucloud/common/client/DefaultClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import cn.ucloud.common.transport.DefaultTransport;
import cn.ucloud.common.transport.Transport;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

Expand Down Expand Up @@ -135,4 +136,9 @@ public Credential getCredential() {
public void setCredential(Credential credential) {
this.credential = credential;
}

@Override
public void close() throws IOException {
this.transport.close();
}
}
56 changes: 27 additions & 29 deletions ucloud-sdk-java-common/src/main/java/cn/ucloud/common/transport/DefaultTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,39 +71,32 @@ public Response invoke(Request request, Class<? extends Response> clazz)
entity.setContentType(ContentType.APPLICATION_JSON.getMimeType());
httpPost.setHeader(HTTP.CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType());
httpPost.setEntity(entity);

// invoke http requesting
CloseableHttpResponse httpResponse;
try {
httpResponse = this.getHttpClient().execute(httpPost);
try (CloseableHttpResponse httpResponse = this.getHttpClient().execute(httpPost)) {
String requestId = "";
if (httpResponse.getLastHeader(HEADER_REQUEST_ID) != null) {
requestId = httpResponse.getLastHeader(HEADER_REQUEST_ID).getValue();
}

// check http status
StatusLine httpStatus = httpResponse.getStatusLine();
if (httpStatus.getStatusCode() >= 400) {
throw new UCloudException(
String.format(
"http error, status code %d %s",
httpStatus.getStatusCode(), httpStatus.getReasonPhrase()));
}

// decode response
String content = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
Response response = new Gson().fromJson(content, clazz);
response.setRequestId(requestId);
return response;
} catch (UCloudException e) {
throw e;
} catch (Exception e) {
throw new TransportException("http error", e);
}

String requestId = "";
if (httpResponse.getLastHeader(HEADER_REQUEST_ID) != null) {
requestId = httpResponse.getLastHeader(HEADER_REQUEST_ID).getValue();
}

// check http status
StatusLine httpStatus = httpResponse.getStatusLine();
if (httpStatus.getStatusCode() >= 400) {
throw new UCloudException(
String.format(
"http error, status code %d %s",
httpStatus.getStatusCode(), httpStatus.getReasonPhrase()));
}

// decode response
String content = null;
try {
content = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
} catch (IOException e) {
throw new UCloudException("http error", e);
}
Response response = new Gson().fromJson(content, clazz);
response.setRequestId(requestId);
return response;
}

public String getBaseUrl() {
Expand All @@ -129,4 +122,9 @@ public CloseableHttpClient getHttpClient() {
public void setHttpClient(CloseableHttpClient httpClient) {
this.httpClient = httpClient;
}

@Override
public void close() throws IOException {
this.httpClient.close();
}
}
4 changes: 3 additions & 1 deletion ucloud-sdk-java-common/src/main/java/cn/ucloud/common/transport/Transport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
import cn.ucloud.common.request.Request;
import cn.ucloud.common.response.Response;

public interface Transport {
import java.io.Closeable;

public interface Transport extends Closeable {
/**
* @param request Request payload with data
* @param clazz Response class without data
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ipsecvpn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ipsecvpn</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-pathx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-pathx</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-uaccount/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-uaccount</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ubill/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ubill</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ucdn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ucdn</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-udb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-udb</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-udbproxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-udbproxy</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-udi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-udi</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-udisk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-udisk</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-udpn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-udpn</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.7-release</version>
<version>1.2.8-release</version>
</dependency>

<dependency>
Expand Down
Loading