Merge branch 'natgateway-Java-2020-04-01-online-1760-2025_10_29_17_30_58' into 'integration_2025-11-06_1076839247618'

feat: [development task] natgateway-1760-Java (1806259)

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

Author: BitsAdmin

volcengine-java-sdk-natgateway/src/main/java/com/volcengine/natgateway/NatgatewayApi.java

@@ -48,6 +48,9 @@ public class CreateDnatEntryRequest {
   @SerializedName("NatGatewayId")
   private String natGatewayId = null;
 
+  @SerializedName("PortType")
+  private String portType = null;
+
   @SerializedName("Protocol")
   private String protocol = null;
 
@@ -164,6 +167,24 @@ public void setNatGatewayId(String natGatewayId) {
     this.natGatewayId = natGatewayId;
   }
 
+  public CreateDnatEntryRequest portType(String portType) {
+    this.portType = portType;
+    return this;
+  }
+
+   /**
+   * Get portType
+   * @return portType
+  **/
+  @Schema(description = "")
+  public String getPortType() {
+    return portType;
+  }
+
+  public void setPortType(String portType) {
+    this.portType = portType;
+  }
+
   public CreateDnatEntryRequest protocol(String protocol) {
     this.protocol = protocol;
     return this;
@@ -199,12 +220,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.internalIp, createDnatEntryRequest.internalIp) &&
         Objects.equals(this.internalPort, createDnatEntryRequest.internalPort) &&
         Objects.equals(this.natGatewayId, createDnatEntryRequest.natGatewayId) &&
+        Objects.equals(this.portType, createDnatEntryRequest.portType) &&
         Objects.equals(this.protocol, createDnatEntryRequest.protocol);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(dnatEntryName, externalIp, externalPort, internalIp, internalPort, natGatewayId, protocol);
+    return Objects.hash(dnatEntryName, externalIp, externalPort, internalIp, internalPort, natGatewayId, portType, protocol);
   }
 
 
@@ -219,6 +241,7 @@ public String toString() {
     sb.append("    internalIp: ").append(toIndentedString(internalIp)).append("\n");
     sb.append("    internalPort: ").append(toIndentedString(internalPort)).append("\n");
     sb.append("    natGatewayId: ").append(toIndentedString(natGatewayId)).append("\n");
+    sb.append("    portType: ").append(toIndentedString(portType)).append("\n");
     sb.append("    protocol: ").append(toIndentedString(protocol)).append("\n");
     sb.append("}");
     return sb.toString();

volcengine-java-sdk-natgateway/src/main/java/com/volcengine/natgateway/model/CreateDnatEntryRequest.java

@@ -42,108 +42,26 @@ public class CreateNatGatewayRequest {
   @SerializedName("Description")
   private String description = null;
 
+  @SerializedName("DirectMode")
+  private Boolean directMode = null;
+
   @SerializedName("NatGatewayName")
   private String natGatewayName = null;
 
+  @SerializedName("NetworkType")
+  private String networkType = null;
+
   @SerializedName("Period")
   private Integer period = null;
 
-  /**
-   * Gets or Sets periodUnit
-   */
-  @JsonAdapter(PeriodUnitEnum.Adapter.class)
-  public enum PeriodUnitEnum {
-    @SerializedName("Month")
-    MONTH("Month"),
-    @SerializedName("Year")
-    YEAR("Year");
-
-    private String value;
-
-    PeriodUnitEnum(String value) {
-      this.value = value;
-    }
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-    public static PeriodUnitEnum fromValue(String input) {
-      for (PeriodUnitEnum b : PeriodUnitEnum.values()) {
-        if (b.value.equals(input)) {
-          return b;
-        }
-      }
-      return null;
-    }
-    public static class Adapter extends TypeAdapter<PeriodUnitEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final PeriodUnitEnum enumeration) throws IOException {
-        jsonWriter.value(String.valueOf(enumeration.getValue()));
-      }
-
-      @Override
-      public PeriodUnitEnum read(final JsonReader jsonReader) throws IOException {
-        Object value = jsonReader.nextString();
-        return PeriodUnitEnum.fromValue((String)(value));
-      }
-    }
-  }  @SerializedName("PeriodUnit")
-  private PeriodUnitEnum periodUnit = null;
+  @SerializedName("PeriodUnit")
+  private String periodUnit = null;
 
   @SerializedName("ProjectName")
   private String projectName = null;
 
-  /**
-   * Gets or Sets spec
-   */
-  @JsonAdapter(SpecEnum.Adapter.class)
-  public enum SpecEnum {
-    @SerializedName("Small")
-    SMALL("Small"),
-    @SerializedName("Medium")
-    MEDIUM("Medium"),
-    @SerializedName("Large")
-    LARGE("Large");
-
-    private String value;
-
-    SpecEnum(String value) {
-      this.value = value;
-    }
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-    public static SpecEnum fromValue(String input) {
-      for (SpecEnum b : SpecEnum.values()) {
-        if (b.value.equals(input)) {
-          return b;
-        }
-      }
-      return null;
-    }
-    public static class Adapter extends TypeAdapter<SpecEnum> {
-      @Override
-      public void write(final JsonWriter jsonWriter, final SpecEnum enumeration) throws IOException {
-        jsonWriter.value(String.valueOf(enumeration.getValue()));
-      }
-
-      @Override
-      public SpecEnum read(final JsonReader jsonReader) throws IOException {
-        Object value = jsonReader.nextString();
-        return SpecEnum.fromValue((String)(value));
-      }
-    }
-  }  @SerializedName("Spec")
-  private SpecEnum spec = null;
+  @SerializedName("Spec")
+  private String spec = null;
 
   @SerializedName("SubnetId")
   private String subnetId = null;
@@ -162,10 +80,10 @@ public CreateNatGatewayRequest billingType(Integer billingType) {
    /**
    * Get billingType
    * minimum: 1
-   * maximum: 1
+   * maximum: 3
    * @return billingType
   **/
- @Min(1) @Max(1)  @Schema(description = "")
+ @Min(1) @Max(3)  @Schema(description = "")
   public Integer getBillingType() {
     return billingType;
   }
@@ -210,6 +128,24 @@ public void setDescription(String description) {
     this.description = description;
   }
 
+  public CreateNatGatewayRequest directMode(Boolean directMode) {
+    this.directMode = directMode;
+    return this;
+  }
+
+   /**
+   * Get directMode
+   * @return directMode
+  **/
+  @Schema(description = "")
+  public Boolean isDirectMode() {
+    return directMode;
+  }
+
+  public void setDirectMode(Boolean directMode) {
+    this.directMode = directMode;
+  }
+
   public CreateNatGatewayRequest natGatewayName(String natGatewayName) {
     this.natGatewayName = natGatewayName;
     return this;
@@ -228,6 +164,24 @@ public void setNatGatewayName(String natGatewayName) {
     this.natGatewayName = natGatewayName;
   }
 
+  public CreateNatGatewayRequest networkType(String networkType) {
+    this.networkType = networkType;
+    return this;
+  }
+
+   /**
+   * Get networkType
+   * @return networkType
+  **/
+  @Schema(description = "")
+  public String getNetworkType() {
+    return networkType;
+  }
+
+  public void setNetworkType(String networkType) {
+    this.networkType = networkType;
+  }
+
   public CreateNatGatewayRequest period(Integer period) {
     this.period = period;
     return this;
@@ -246,7 +200,7 @@ public void setPeriod(Integer period) {
     this.period = period;
   }
 
-  public CreateNatGatewayRequest periodUnit(PeriodUnitEnum periodUnit) {
+  public CreateNatGatewayRequest periodUnit(String periodUnit) {
     this.periodUnit = periodUnit;
     return this;
   }
@@ -256,11 +210,11 @@ public CreateNatGatewayRequest periodUnit(PeriodUnitEnum periodUnit) {
    * @return periodUnit
   **/
   @Schema(description = "")
-  public PeriodUnitEnum getPeriodUnit() {
+  public String getPeriodUnit() {
     return periodUnit;
   }
 
-  public void setPeriodUnit(PeriodUnitEnum periodUnit) {
+  public void setPeriodUnit(String periodUnit) {
     this.periodUnit = periodUnit;
   }
 
@@ -282,7 +236,7 @@ public void setProjectName(String projectName) {
     this.projectName = projectName;
   }
 
-  public CreateNatGatewayRequest spec(SpecEnum spec) {
+  public CreateNatGatewayRequest spec(String spec) {
     this.spec = spec;
     return this;
   }
@@ -292,11 +246,11 @@ public CreateNatGatewayRequest spec(SpecEnum spec) {
    * @return spec
   **/
   @Schema(description = "")
-  public SpecEnum getSpec() {
+  public String getSpec() {
     return spec;
   }
 
-  public void setSpec(SpecEnum spec) {
+  public void setSpec(String spec) {
     this.spec = spec;
   }
 
@@ -377,7 +331,9 @@ public boolean equals(java.lang.Object o) {
     return Objects.equals(this.billingType, createNatGatewayRequest.billingType) &&
         Objects.equals(this.clientToken, createNatGatewayRequest.clientToken) &&
         Objects.equals(this.description, createNatGatewayRequest.description) &&
+        Objects.equals(this.directMode, createNatGatewayRequest.directMode) &&
         Objects.equals(this.natGatewayName, createNatGatewayRequest.natGatewayName) &&
+        Objects.equals(this.networkType, createNatGatewayRequest.networkType) &&
         Objects.equals(this.period, createNatGatewayRequest.period) &&
         Objects.equals(this.periodUnit, createNatGatewayRequest.periodUnit) &&
         Objects.equals(this.projectName, createNatGatewayRequest.projectName) &&
@@ -389,7 +345,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(billingType, clientToken, description, natGatewayName, period, periodUnit, projectName, spec, subnetId, tags, vpcId);
+    return Objects.hash(billingType, clientToken, description, directMode, natGatewayName, networkType, period, periodUnit, projectName, spec, subnetId, tags, vpcId);
   }
 
 
@@ -401,7 +357,9 @@ 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("    directMode: ").append(toIndentedString(directMode)).append("\n");
     sb.append("    natGatewayName: ").append(toIndentedString(natGatewayName)).append("\n");
+    sb.append("    networkType: ").append(toIndentedString(networkType)).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");