Merge branch 'vpn-Java-2020-04-01-online-1282-2025_06_12_10_01_02' into 'integration_2025-06-19_956533420802'

feat: [development task] vpn-1282-Java (1359914)

See merge request iaasng/volcengine-java-sdk!540

Author: BitsAdmin

volcengine-java-sdk-vpn/src/main/java/com/volcengine/vpn/VpnApi.java

@@ -89,6 +89,8 @@
 import com.volcengine.vpn.model.ModifyVpnConnectionAttributesResponse;
 import com.volcengine.vpn.model.ModifyVpnConnectionHealthCheckerRequest;
 import com.volcengine.vpn.model.ModifyVpnConnectionHealthCheckerResponse;
+import com.volcengine.vpn.model.ModifyVpnConnectionTunnelAttributesRequest;
+import com.volcengine.vpn.model.ModifyVpnConnectionTunnelAttributesResponse;
 import com.volcengine.vpn.model.ModifyVpnGatewayAttributesRequest;
 import com.volcengine.vpn.model.ModifyVpnGatewayAttributesResponse;
 import com.volcengine.vpn.model.RenewVpnGatewayRequest;
@@ -3967,6 +3969,130 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
+    /**
+     * Build call for modifyVpnConnectionTunnelAttributes
+     * @param body  (required)
+     * @param progressListener Progress listener
+     * @param progressRequestListener Progress request listener
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    public com.squareup.okhttp.Call modifyVpnConnectionTunnelAttributesCall(ModifyVpnConnectionTunnelAttributesRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = body;
+        
+        // create path and map variables
+        String localVarPath = "/ModifyVpnConnectionTunnelAttributes/2020-04-01/vpn/get/text_plain/";
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "text/plain"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        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, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+    
+    @SuppressWarnings("rawtypes")
+    private com.squareup.okhttp.Call modifyVpnConnectionTunnelAttributesValidateBeforeCall(ModifyVpnConnectionTunnelAttributesRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling modifyVpnConnectionTunnelAttributes(Async)");
+        }
+        
+        com.squareup.okhttp.Call call = modifyVpnConnectionTunnelAttributesCall(body, progressListener, progressRequestListener);
+        return call;
+
+        
+        
+        
+        
+    }
+
+    /**
+     * 
+     * 
+     * @param body  (required)
+     * @return ModifyVpnConnectionTunnelAttributesResponse
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ModifyVpnConnectionTunnelAttributesResponse modifyVpnConnectionTunnelAttributes(ModifyVpnConnectionTunnelAttributesRequest body) throws ApiException {
+        ApiResponse<ModifyVpnConnectionTunnelAttributesResponse> resp = modifyVpnConnectionTunnelAttributesWithHttpInfo(body);
+        return resp.getData();
+    }
+
+    /**
+     * 
+     * 
+     * @param body  (required)
+     * @return ApiResponse&lt;ModifyVpnConnectionTunnelAttributesResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<ModifyVpnConnectionTunnelAttributesResponse> modifyVpnConnectionTunnelAttributesWithHttpInfo( @NotNull ModifyVpnConnectionTunnelAttributesRequest body) throws ApiException {
+        com.squareup.okhttp.Call call = modifyVpnConnectionTunnelAttributesValidateBeforeCall(body, null, null);
+        Type localVarReturnType = new TypeToken<ModifyVpnConnectionTunnelAttributesResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     *  (asynchronously)
+     * 
+     * @param body  (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public com.squareup.okhttp.Call modifyVpnConnectionTunnelAttributesAsync(ModifyVpnConnectionTunnelAttributesRequest body, final ApiCallback<ModifyVpnConnectionTunnelAttributesResponse> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        com.squareup.okhttp.Call call = modifyVpnConnectionTunnelAttributesValidateBeforeCall(body, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<ModifyVpnConnectionTunnelAttributesResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
     /**
      * Build call for modifyVpnGatewayAttributes
      * @param body  (required)

volcengine-java-sdk-vpn/src/main/java/com/volcengine/vpn/model/BgpConfigForCreateVpnConnectionInput.java

@@ -48,8 +48,7 @@ public BgpConfigForCreateVpnConnectionInput enableBgp(Boolean enableBgp) {
    * Get enableBgp
    * @return enableBgp
   **/
-  @NotNull
-  @Schema(required = true, description = "")
+  @Schema(description = "")
   public Boolean isEnableBgp() {
     return enableBgp;
   }

volcengine-java-sdk-vpn/src/main/java/com/volcengine/vpn/model/CreateVpnConnectionRequest.java

@@ -22,6 +22,7 @@
 import com.volcengine.vpn.model.BgpConfigForCreateVpnConnectionInput;
 import com.volcengine.vpn.model.IkeConfigForCreateVpnConnectionInput;
 import com.volcengine.vpn.model.IpsecConfigForCreateVpnConnectionInput;
+import com.volcengine.vpn.model.TunnelOptionForCreateVpnConnectionInput;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -80,6 +81,9 @@ public class CreateVpnConnectionRequest {
   @SerializedName("Spec")
   private String spec = null;
 
+  @SerializedName("TunnelOptions")
+  private List<TunnelOptionForCreateVpnConnectionInput> tunnelOptions = null;
+
   @SerializedName("VpnConnectionName")
   private String vpnConnectionName = null;
 
@@ -150,8 +154,7 @@ public CreateVpnConnectionRequest customerGatewayId(String customerGatewayId) {
    * Get customerGatewayId
    * @return customerGatewayId
   **/
-  @NotNull
-  @Schema(required = true, description = "")
+  @Schema(description = "")
   public String getCustomerGatewayId() {
     return customerGatewayId;
   }
@@ -376,6 +379,33 @@ public void setSpec(String spec) {
     this.spec = spec;
   }
 
+  public CreateVpnConnectionRequest tunnelOptions(List<TunnelOptionForCreateVpnConnectionInput> tunnelOptions) {
+    this.tunnelOptions = tunnelOptions;
+    return this;
+  }
+
+  public CreateVpnConnectionRequest addTunnelOptionsItem(TunnelOptionForCreateVpnConnectionInput tunnelOptionsItem) {
+    if (this.tunnelOptions == null) {
+      this.tunnelOptions = new ArrayList<TunnelOptionForCreateVpnConnectionInput>();
+    }
+    this.tunnelOptions.add(tunnelOptionsItem);
+    return this;
+  }
+
+   /**
+   * Get tunnelOptions
+   * @return tunnelOptions
+  **/
+  @Valid
+  @Schema(description = "")
+  public List<TunnelOptionForCreateVpnConnectionInput> getTunnelOptions() {
+    return tunnelOptions;
+  }
+
+  public void setTunnelOptions(List<TunnelOptionForCreateVpnConnectionInput> tunnelOptions) {
+    this.tunnelOptions = tunnelOptions;
+  }
+
   public CreateVpnConnectionRequest vpnConnectionName(String vpnConnectionName) {
     this.vpnConnectionName = vpnConnectionName;
     return this;
@@ -403,8 +433,7 @@ public CreateVpnConnectionRequest vpnGatewayId(String vpnGatewayId) {
    * Get vpnGatewayId
    * @return vpnGatewayId
   **/
-  @NotNull
-  @Schema(required = true, description = "")
+  @Schema(description = "")
   public String getVpnGatewayId() {
     return vpnGatewayId;
   }
@@ -438,13 +467,14 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.projectName, createVpnConnectionRequest.projectName) &&
         Objects.equals(this.remoteSubnet, createVpnConnectionRequest.remoteSubnet) &&
         Objects.equals(this.spec, createVpnConnectionRequest.spec) &&
+        Objects.equals(this.tunnelOptions, createVpnConnectionRequest.tunnelOptions) &&
         Objects.equals(this.vpnConnectionName, createVpnConnectionRequest.vpnConnectionName) &&
         Objects.equals(this.vpnGatewayId, createVpnConnectionRequest.vpnGatewayId);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(attachType, bgpConfig, clientToken, customerGatewayId, description, dpdAction, ikeConfig, ipsecConfig, localSubnet, logEnabled, natTraversal, negotiateInstantly, projectName, remoteSubnet, spec, vpnConnectionName, vpnGatewayId);
+    return Objects.hash(attachType, bgpConfig, clientToken, customerGatewayId, description, dpdAction, ikeConfig, ipsecConfig, localSubnet, logEnabled, natTraversal, negotiateInstantly, projectName, remoteSubnet, spec, tunnelOptions, vpnConnectionName, vpnGatewayId);
   }
 
 
@@ -468,6 +498,7 @@ public String toString() {
     sb.append("    projectName: ").append(toIndentedString(projectName)).append("\n");
     sb.append("    remoteSubnet: ").append(toIndentedString(remoteSubnet)).append("\n");
     sb.append("    spec: ").append(toIndentedString(spec)).append("\n");
+    sb.append("    tunnelOptions: ").append(toIndentedString(tunnelOptions)).append("\n");
     sb.append("    vpnConnectionName: ").append(toIndentedString(vpnConnectionName)).append("\n");
     sb.append("    vpnGatewayId: ").append(toIndentedString(vpnGatewayId)).append("\n");
     sb.append("}");

volcengine-java-sdk-vpn/src/main/java/com/volcengine/vpn/model/CreateVpnGatewayRequest.java

@@ -48,6 +48,9 @@ public class CreateVpnGatewayRequest {
   @SerializedName("Description")
   private String description = null;
 
+  @SerializedName("DualTunnelEnabled")
+  private Boolean dualTunnelEnabled = null;
+
   @SerializedName("IpsecEnabled")
   private Boolean ipsecEnabled = null;
 
@@ -60,6 +63,9 @@ public class CreateVpnGatewayRequest {
   @SerializedName("ProjectName")
   private String projectName = null;
 
+  @SerializedName("SecondarySubnetId")
+  private String secondarySubnetId = null;
+
   @SerializedName("SslEnabled")
   private Boolean sslEnabled = null;
 
@@ -169,6 +175,24 @@ public void setDescription(String description) {
     this.description = description;
   }
 
+  public CreateVpnGatewayRequest dualTunnelEnabled(Boolean dualTunnelEnabled) {
+    this.dualTunnelEnabled = dualTunnelEnabled;
+    return this;
+  }
+
+   /**
+   * Get dualTunnelEnabled
+   * @return dualTunnelEnabled
+  **/
+  @Schema(description = "")
+  public Boolean isDualTunnelEnabled() {
+    return dualTunnelEnabled;
+  }
+
+  public void setDualTunnelEnabled(Boolean dualTunnelEnabled) {
+    this.dualTunnelEnabled = dualTunnelEnabled;
+  }
+
   public CreateVpnGatewayRequest ipsecEnabled(Boolean ipsecEnabled) {
     this.ipsecEnabled = ipsecEnabled;
     return this;
@@ -241,6 +265,24 @@ public void setProjectName(String projectName) {
     this.projectName = projectName;
   }
 
+  public CreateVpnGatewayRequest secondarySubnetId(String secondarySubnetId) {
+    this.secondarySubnetId = secondarySubnetId;
+    return this;
+  }
+
+   /**
+   * Get secondarySubnetId
+   * @return secondarySubnetId
+  **/
+  @Schema(description = "")
+  public String getSecondarySubnetId() {
+    return secondarySubnetId;
+  }
+
+  public void setSecondarySubnetId(String secondarySubnetId) {
+    this.secondarySubnetId = secondarySubnetId;
+  }
+
   public CreateVpnGatewayRequest sslEnabled(Boolean sslEnabled) {
     this.sslEnabled = sslEnabled;
     return this;
@@ -375,10 +417,12 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.billingType, createVpnGatewayRequest.billingType) &&
         Objects.equals(this.clientToken, createVpnGatewayRequest.clientToken) &&
         Objects.equals(this.description, createVpnGatewayRequest.description) &&
+        Objects.equals(this.dualTunnelEnabled, createVpnGatewayRequest.dualTunnelEnabled) &&
         Objects.equals(this.ipsecEnabled, createVpnGatewayRequest.ipsecEnabled) &&
         Objects.equals(this.period, createVpnGatewayRequest.period) &&
         Objects.equals(this.periodUnit, createVpnGatewayRequest.periodUnit) &&
         Objects.equals(this.projectName, createVpnGatewayRequest.projectName) &&
+        Objects.equals(this.secondarySubnetId, createVpnGatewayRequest.secondarySubnetId) &&
         Objects.equals(this.sslEnabled, createVpnGatewayRequest.sslEnabled) &&
         Objects.equals(this.sslMaxConnections, createVpnGatewayRequest.sslMaxConnections) &&
         Objects.equals(this.subnetId, createVpnGatewayRequest.subnetId) &&
@@ -389,7 +433,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(asn, bandwidth, billingType, clientToken, description, ipsecEnabled, period, periodUnit, projectName, sslEnabled, sslMaxConnections, subnetId, tags, vpcId, vpnGatewayName);
+    return Objects.hash(asn, bandwidth, billingType, clientToken, description, dualTunnelEnabled, ipsecEnabled, period, periodUnit, projectName, secondarySubnetId, sslEnabled, sslMaxConnections, subnetId, tags, vpcId, vpnGatewayName);
   }
 
 
@@ -403,10 +447,12 @@ public String toString() {
     sb.append("    billingType: ").append(toIndentedString(billingType)).append("\n");
     sb.append("    clientToken: ").append(toIndentedString(clientToken)).append("\n");
     sb.append("    description: ").append(toIndentedString(description)).append("\n");
+    sb.append("    dualTunnelEnabled: ").append(toIndentedString(dualTunnelEnabled)).append("\n");
     sb.append("    ipsecEnabled: ").append(toIndentedString(ipsecEnabled)).append("\n");
     sb.append("    period: ").append(toIndentedString(period)).append("\n");
     sb.append("    periodUnit: ").append(toIndentedString(periodUnit)).append("\n");
     sb.append("    projectName: ").append(toIndentedString(projectName)).append("\n");
+    sb.append("    secondarySubnetId: ").append(toIndentedString(secondarySubnetId)).append("\n");
     sb.append("    sslEnabled: ").append(toIndentedString(sslEnabled)).append("\n");
     sb.append("    sslMaxConnections: ").append(toIndentedString(sslMaxConnections)).append("\n");
     sb.append("    subnetId: ").append(toIndentedString(subnetId)).append("\n");