From 97055eafa5518a0c0f1ba4bb0b079a841c17d003 Mon Sep 17 00:00:00 2001 From: gitnexbot Date: Wed, 15 Apr 2026 00:02:01 +0000 Subject: [PATCH] Synchronizing API and documentation updates --- docs/MergePullRequestOption.md | 8 +- .../v2/models/MergePullRequestOption.java | 205 +++++++++--------- 2 files changed, 107 insertions(+), 106 deletions(-) diff --git a/docs/MergePullRequestOption.md b/docs/MergePullRequestOption.md index d6555d3..a301bf8 100644 --- a/docs/MergePullRequestOption.md +++ b/docs/MergePullRequestOption.md @@ -3,13 +3,13 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**_do** | [**DoEnum**](#DoEnum) | | -**mergeCommitID** | **String** | | [optional] -**mergeMessageField** | **String** | | [optional] -**mergeTitleField** | **String** | | [optional] **deleteBranchAfterMerge** | **Boolean** | | [optional] +**_do** | [**DoEnum**](#DoEnum) | | **forceMerge** | **Boolean** | | [optional] **headCommitId** | **String** | | [optional] +**mergeCommitId** | **String** | | [optional] +**mergeMessageField** | **String** | | [optional] +**mergeTitleField** | **String** | | [optional] **mergeWhenChecksSucceed** | **Boolean** | | [optional] diff --git a/src/main/java/org/gitnex/tea4j/v2/models/MergePullRequestOption.java b/src/main/java/org/gitnex/tea4j/v2/models/MergePullRequestOption.java index 84e6521..6de5507 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/MergePullRequestOption.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/MergePullRequestOption.java @@ -26,6 +26,10 @@ import java.util.Objects; @Schema(description = "MergePullRequestForm form for merging Pull Request") public class MergePullRequestOption implements Serializable { private static final long serialVersionUID = 1L; + + @SerializedName("delete_branch_after_merge") + private Boolean deleteBranchAfterMerge = null; + /** Gets or Sets _do */ @JsonAdapter(DoEnum.Adapter.class) public enum DoEnum { @@ -74,106 +78,27 @@ public class MergePullRequestOption implements Serializable { } } - @SerializedName("Do") + @SerializedName("do") private DoEnum _do = null; - @SerializedName("MergeCommitID") - private String mergeCommitID = null; - - @SerializedName("MergeMessageField") - private String mergeMessageField = null; - - @SerializedName("MergeTitleField") - private String mergeTitleField = null; - - @SerializedName("delete_branch_after_merge") - private Boolean deleteBranchAfterMerge = null; - @SerializedName("force_merge") private Boolean forceMerge = null; @SerializedName("head_commit_id") private String headCommitId = null; + @SerializedName("merge_commit_id") + private String mergeCommitId = null; + + @SerializedName("merge_message_field") + private String mergeMessageField = null; + + @SerializedName("merge_title_field") + private String mergeTitleField = null; + @SerializedName("merge_when_checks_succeed") private Boolean mergeWhenChecksSucceed = null; - public MergePullRequestOption _do(DoEnum _do) { - this._do = _do; - return this; - } - - /** - * Get _do - * - * @return _do - */ - @Schema(required = true, description = "") - public DoEnum getDo() { - return _do; - } - - public void setDo(DoEnum _do) { - this._do = _do; - } - - public MergePullRequestOption mergeCommitID(String mergeCommitID) { - this.mergeCommitID = mergeCommitID; - return this; - } - - /** - * Get mergeCommitID - * - * @return mergeCommitID - */ - @Schema(description = "") - public String getMergeCommitID() { - return mergeCommitID; - } - - public void setMergeCommitID(String mergeCommitID) { - this.mergeCommitID = mergeCommitID; - } - - public MergePullRequestOption mergeMessageField(String mergeMessageField) { - this.mergeMessageField = mergeMessageField; - return this; - } - - /** - * Get mergeMessageField - * - * @return mergeMessageField - */ - @Schema(description = "") - public String getMergeMessageField() { - return mergeMessageField; - } - - public void setMergeMessageField(String mergeMessageField) { - this.mergeMessageField = mergeMessageField; - } - - public MergePullRequestOption mergeTitleField(String mergeTitleField) { - this.mergeTitleField = mergeTitleField; - return this; - } - - /** - * Get mergeTitleField - * - * @return mergeTitleField - */ - @Schema(description = "") - public String getMergeTitleField() { - return mergeTitleField; - } - - public void setMergeTitleField(String mergeTitleField) { - this.mergeTitleField = mergeTitleField; - } - public MergePullRequestOption deleteBranchAfterMerge(Boolean deleteBranchAfterMerge) { this.deleteBranchAfterMerge = deleteBranchAfterMerge; return this; @@ -193,6 +118,25 @@ public class MergePullRequestOption implements Serializable { this.deleteBranchAfterMerge = deleteBranchAfterMerge; } + public MergePullRequestOption _do(DoEnum _do) { + this._do = _do; + return this; + } + + /** + * Get _do + * + * @return _do + */ + @Schema(required = true, description = "") + public DoEnum getDo() { + return _do; + } + + public void setDo(DoEnum _do) { + this._do = _do; + } + public MergePullRequestOption forceMerge(Boolean forceMerge) { this.forceMerge = forceMerge; return this; @@ -231,6 +175,63 @@ public class MergePullRequestOption implements Serializable { this.headCommitId = headCommitId; } + public MergePullRequestOption mergeCommitId(String mergeCommitId) { + this.mergeCommitId = mergeCommitId; + return this; + } + + /** + * Get mergeCommitId + * + * @return mergeCommitId + */ + @Schema(description = "") + public String getMergeCommitId() { + return mergeCommitId; + } + + public void setMergeCommitId(String mergeCommitId) { + this.mergeCommitId = mergeCommitId; + } + + public MergePullRequestOption mergeMessageField(String mergeMessageField) { + this.mergeMessageField = mergeMessageField; + return this; + } + + /** + * Get mergeMessageField + * + * @return mergeMessageField + */ + @Schema(description = "") + public String getMergeMessageField() { + return mergeMessageField; + } + + public void setMergeMessageField(String mergeMessageField) { + this.mergeMessageField = mergeMessageField; + } + + public MergePullRequestOption mergeTitleField(String mergeTitleField) { + this.mergeTitleField = mergeTitleField; + return this; + } + + /** + * Get mergeTitleField + * + * @return mergeTitleField + */ + @Schema(description = "") + public String getMergeTitleField() { + return mergeTitleField; + } + + public void setMergeTitleField(String mergeTitleField) { + this.mergeTitleField = mergeTitleField; + } + public MergePullRequestOption mergeWhenChecksSucceed(Boolean mergeWhenChecksSucceed) { this.mergeWhenChecksSucceed = mergeWhenChecksSucceed; return this; @@ -259,14 +260,14 @@ public class MergePullRequestOption implements Serializable { return false; } MergePullRequestOption mergePullRequestOption = (MergePullRequestOption) o; - return Objects.equals(this._do, mergePullRequestOption._do) - && Objects.equals(this.mergeCommitID, mergePullRequestOption.mergeCommitID) - && Objects.equals(this.mergeMessageField, mergePullRequestOption.mergeMessageField) - && Objects.equals(this.mergeTitleField, mergePullRequestOption.mergeTitleField) - && Objects.equals( + return Objects.equals( this.deleteBranchAfterMerge, mergePullRequestOption.deleteBranchAfterMerge) + && Objects.equals(this._do, mergePullRequestOption._do) && Objects.equals(this.forceMerge, mergePullRequestOption.forceMerge) && Objects.equals(this.headCommitId, mergePullRequestOption.headCommitId) + && Objects.equals(this.mergeCommitId, mergePullRequestOption.mergeCommitId) + && Objects.equals(this.mergeMessageField, mergePullRequestOption.mergeMessageField) + && Objects.equals(this.mergeTitleField, mergePullRequestOption.mergeTitleField) && Objects.equals( this.mergeWhenChecksSucceed, mergePullRequestOption.mergeWhenChecksSucceed); } @@ -274,13 +275,13 @@ public class MergePullRequestOption implements Serializable { @Override public int hashCode() { return Objects.hash( - _do, - mergeCommitID, - mergeMessageField, - mergeTitleField, deleteBranchAfterMerge, + _do, forceMerge, headCommitId, + mergeCommitId, + mergeMessageField, + mergeTitleField, mergeWhenChecksSucceed); } @@ -289,15 +290,15 @@ public class MergePullRequestOption implements Serializable { StringBuilder sb = new StringBuilder(); sb.append("class MergePullRequestOption {\n"); - sb.append(" _do: ").append(toIndentedString(_do)).append("\n"); - sb.append(" mergeCommitID: ").append(toIndentedString(mergeCommitID)).append("\n"); - sb.append(" mergeMessageField: ").append(toIndentedString(mergeMessageField)).append("\n"); - sb.append(" mergeTitleField: ").append(toIndentedString(mergeTitleField)).append("\n"); sb.append(" deleteBranchAfterMerge: ") .append(toIndentedString(deleteBranchAfterMerge)) .append("\n"); + sb.append(" _do: ").append(toIndentedString(_do)).append("\n"); sb.append(" forceMerge: ").append(toIndentedString(forceMerge)).append("\n"); sb.append(" headCommitId: ").append(toIndentedString(headCommitId)).append("\n"); + sb.append(" mergeCommitId: ").append(toIndentedString(mergeCommitId)).append("\n"); + sb.append(" mergeMessageField: ").append(toIndentedString(mergeMessageField)).append("\n"); + sb.append(" mergeTitleField: ").append(toIndentedString(mergeTitleField)).append("\n"); sb.append(" mergeWhenChecksSucceed: ") .append(toIndentedString(mergeWhenChecksSucceed)) .append("\n");