Merge branch 'core_patch' into 'master'

xuyaming0800 · xuyaming0800 · commit 34cf05682ed0 · 2022-12-23T10:15:16.000Z
feat: Core patch [skipped]

See merge request iaasng/volcengine-java-sdk!38
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.volcengine</groupId>
 	  <artifactId>volcengine-java-sdk-bom</artifactId>
-       <version>0.1.29</version>
+       <version>0.1.30</version>
 	  <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -70,12 +70,12 @@
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk-vpc</artifactId>
-   <version>0.1.29</version>
+   <version>0.1.30</version>
   </dependency>
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk-ecs</artifactId>
-   <version>0.1.29</version>
+   <version>0.1.30</version>
   </dependency>
 </dependencies>
 ```
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.29</version>
+    <version>0.1.30</version>
     <name>volcengine-java-sdk</name>
     <url>https://open.volcengineapi.com</url>
     <description>The Java SDK For Volcengine</description>
diff --git a/volcengine-java-sdk-alb/pom.xml b/volcengine-java-sdk-alb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-autoscaling/pom.xml b/volcengine-java-sdk-autoscaling/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-bom/pom.xml b/volcengine-java-sdk-bom/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-cen/pom.xml b/volcengine-java-sdk-cen/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-clb/pom.xml b/volcengine-java-sdk-clb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-core/pom.xml b/volcengine-java-sdk-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.volcengine</groupId>
         <artifactId>volcengine-java-sdk</artifactId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-core/src/main/java/com/volcengine/ApiClient.java b/volcengine-java-sdk-core/src/main/java/com/volcengine/ApiClient.java
diff --git a/volcengine-java-sdk-core/src/main/java/com/volcengine/ContentType.java b/volcengine-java-sdk-core/src/main/java/com/volcengine/ContentType.java
@@ -0,0 +1,16 @@
+package com.volcengine;
+
+/**
+ * xuyaming@bytedance.com
+ * 2022/12/23 15:38
+ */
+public enum ContentType {
+    Default(""),ApplicationJSON("application/json"),FormUrlencoded("x-www-form-urlencoded");
+    private final String type;
+    private ContentType(String type){
+        this.type =type;
+    }
+    public String GetType(){
+        return this.type;
+    }
+}
diff --git a/volcengine-java-sdk-core/src/main/java/com/volcengine/HttpMethod.java b/volcengine-java-sdk-core/src/main/java/com/volcengine/HttpMethod.java
@@ -0,0 +1,17 @@
+package com.volcengine;
+
+/**
+ * xuyaming@bytedance.com
+ * 2022/12/23 15:34
+ */
+public enum HttpMethod {
+    GET("GET"),HEAD("HEAD"),POST("POST"),PUT("PUT"),DELETE("DELETE");
+    private final String method;
+    private HttpMethod(String method){
+        this.method = method;
+    }
+
+    public  String GetMethod(){
+        return method;
+    }
+}
diff --git a/volcengine-java-sdk-core/src/main/java/com/volcengine/UniversalApi.java b/volcengine-java-sdk-core/src/main/java/com/volcengine/UniversalApi.java
@@ -0,0 +1,106 @@
+package com.volcengine;
+
+import com.google.gson.reflect.TypeToken;
+
+import javax.validation.constraints.NotNull;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * xuyaming@bytedance.com
+ * 2022/12/23 15:21
+ */
+public class UniversalApi {
+    private ApiClient apiClient;
+
+    public UniversalApi(ApiClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    public UniversalApi() {
+    }
+
+    public ApiClient getApiClient() {
+        return apiClient;
+    }
+
+    public void setApiClient(ApiClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    public Map<String, Object> doCall(UniversalRequest info, Map<String, Object> input) throws ApiException {
+        ApiResponse<Map<String, Object>> resp = doCallWithHttpInfo(info, input);
+        return resp.getData();
+    }
+
+    public ApiResponse<Map<String, Object>> doCallWithHttpInfo(@NotNull UniversalRequest info, @NotNull Map<String, Object> input) throws ApiException {
+        com.squareup.okhttp.Call call = doCallValidateBeforeCall(info, input, null, null);
+        Type localVarReturnType = new TypeToken<Map<String, Object>>() {
+        }.getType();
+        ApiResponse<Map<String, Object>> obj = apiClient.execute(call, localVarReturnType,true);
+        processNumber(obj.getData());
+        return obj;
+    }
+
+    @SuppressWarnings("unchecked")
+    private void processNumber(Map<String,Object> map){
+        for (Map.Entry<String,Object> entry:map.entrySet()){
+            if (entry.getValue()!= null && entry.getValue() instanceof Map){
+                processNumber((Map<String,Object>)entry.getValue());
+            }
+            if (entry.getValue()!=null  && isNumeric(entry.getValue().toString()) && entry.getValue().toString().contains(".") && entry.getValue().toString().endsWith(".0")){
+                entry.setValue(Double.valueOf(entry.getValue().toString()).longValue());
+            }
+        }
+    }
+
+    private boolean isNumeric(String str) {
+        try {
+            Double.parseDouble(str);
+            return true;
+        } catch(Exception e){
+            return false;
+        }
+    }
+
+    private com.squareup.okhttp.Call doCallValidateBeforeCall(UniversalRequest info, Map<String, Object> input, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        if (input == null) {
+            throw new ApiException("Missing the required parameter 'input' when calling doCall(Async)");
+        }
+        com.squareup.okhttp.Call call = doCall(info, input, progressListener, progressRequestListener);
+        return call;
+    }
+
+    private com.squareup.okhttp.Call doCall(UniversalRequest info, Map<String, Object> input, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+
+        // create path and map variables
+        String localVarPath = String.format("/%s/%s/%s/%s/",info.getAction(),info.getVersion(),info.getServiceName(),info.getHttpMethod().GetMethod().toLowerCase());
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        localVarHeaderParams.put("Accept", "application/json");
+
+        if (info.getContentType().GetType().equals("")){
+            localVarHeaderParams.put("Content-Type", "text/plain");
+        }else{
+            localVarHeaderParams.put("Content-Type", info.getContentType().GetType());
+        }
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
+                @Override
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                            .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                            .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] { "volcengineSign" };
+        return apiClient.buildCall(localVarPath, info.getHttpMethod().GetMethod(), new ArrayList<Pair>(), new ArrayList<Pair>(), input, localVarHeaderParams,  new HashMap<String, Object>(), localVarAuthNames, progressRequestListener,true);
+    }
+}
diff --git a/volcengine-java-sdk-core/src/main/java/com/volcengine/UniversalRequest.java b/volcengine-java-sdk-core/src/main/java/com/volcengine/UniversalRequest.java
@@ -0,0 +1,75 @@
+package com.volcengine;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * xuyaming@bytedance.com
+ * 2022/12/23 15:33
+ */
+public class UniversalRequest {
+    @NotEmpty
+    private String serviceName;
+    @NotEmpty
+    private String action;
+    @NotEmpty
+    private String version;
+    private HttpMethod httpMethod = HttpMethod.GET;
+    private ContentType contentType = ContentType.Default;
+
+    public UniversalRequest(String serviceName, String action, String version, HttpMethod httpMethod, ContentType contentType) {
+        this.serviceName = serviceName;
+        this.action = action;
+        this.version = version;
+        this.httpMethod = httpMethod;
+        this.contentType = contentType;
+    }
+
+    public UniversalRequest() {
+    }
+
+    public UniversalRequest(String serviceName, String action, String version) {
+        this.serviceName = serviceName;
+        this.action = action;
+        this.version = version;
+    }
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public HttpMethod getHttpMethod() {
+        return httpMethod;
+    }
+
+    public void setHttpMethod(HttpMethod httpMethod) {
+        this.httpMethod = httpMethod;
+    }
+
+    public ContentType getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(ContentType contentType) {
+        this.contentType = contentType;
+    }
+}
diff --git a/volcengine-java-sdk-core/src/main/java/com/volcengine/version/Version.java b/volcengine-java-sdk-core/src/main/java/com/volcengine/version/Version.java
@@ -1,6 +1,6 @@
 package com.volcengine.version;
 
 public class Version {
-    public final static String SDK_VERSION = "0.1.28";
+    public final static String SDK_VERSION = "0.1.30";
     public final static String SDK_NAME = "volcengine-java-sdk";
 }
diff --git a/volcengine-java-sdk-cr/pom.xml b/volcengine-java-sdk-cr/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-directconnect/pom.xml b/volcengine-java-sdk-directconnect/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-ecs/pom.xml b/volcengine-java-sdk-ecs/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-mongodb/pom.xml b/volcengine-java-sdk-mongodb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-natgateway/pom.xml b/volcengine-java-sdk-natgateway/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-rdsmysql/pom.xml b/volcengine-java-sdk-rdsmysql/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-storageebs/pom.xml b/volcengine-java-sdk-storageebs/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-vke/pom.xml b/volcengine-java-sdk-vke/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-vpc/pom.xml b/volcengine-java-sdk-vpc/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.29</version>
+        <version>0.1.30</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-vpn/pom.xml b/volcengine-java-sdk-vpn/pom.xml
