diff --git a/docs/MergeUpstreamRequest.md b/docs/MergeUpstreamRequest.md index b21d3d5..065912e 100644 --- a/docs/MergeUpstreamRequest.md +++ b/docs/MergeUpstreamRequest.md @@ -4,3 +4,4 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **branch** | **String** | | [optional] +**ffOnly** | **Boolean** | | [optional] diff --git a/src/main/java/org/gitnex/tea4j/v2/models/MergeUpstreamRequest.java b/src/main/java/org/gitnex/tea4j/v2/models/MergeUpstreamRequest.java index c84cc5f..87f4226 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/MergeUpstreamRequest.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/MergeUpstreamRequest.java @@ -24,6 +24,9 @@ public class MergeUpstreamRequest implements Serializable { @SerializedName("branch") private String branch = null; + @SerializedName("ff_only") + private Boolean ffOnly = null; + public MergeUpstreamRequest branch(String branch) { this.branch = branch; return this; @@ -43,6 +46,25 @@ public class MergeUpstreamRequest implements Serializable { this.branch = branch; } + public MergeUpstreamRequest ffOnly(Boolean ffOnly) { + this.ffOnly = ffOnly; + return this; + } + + /** + * Get ffOnly + * + * @return ffOnly + */ + @Schema(description = "") + public Boolean isFfOnly() { + return ffOnly; + } + + public void setFfOnly(Boolean ffOnly) { + this.ffOnly = ffOnly; + } + @Override public boolean equals(java.lang.Object o) { if (this == o) { @@ -52,12 +74,13 @@ public class MergeUpstreamRequest implements Serializable { return false; } MergeUpstreamRequest mergeUpstreamRequest = (MergeUpstreamRequest) o; - return Objects.equals(this.branch, mergeUpstreamRequest.branch); + return Objects.equals(this.branch, mergeUpstreamRequest.branch) + && Objects.equals(this.ffOnly, mergeUpstreamRequest.ffOnly); } @Override public int hashCode() { - return Objects.hash(branch); + return Objects.hash(branch, ffOnly); } @Override @@ -66,6 +89,7 @@ public class MergeUpstreamRequest implements Serializable { sb.append("class MergeUpstreamRequest {\n"); sb.append(" branch: ").append(toIndentedString(branch)).append("\n"); + sb.append(" ffOnly: ").append(toIndentedString(ffOnly)).append("\n"); sb.append("}"); return sb.toString(); }