diff --git a/docs/BranchProtection.md b/docs/BranchProtection.md index 099b3d6..ff040df 100644 --- a/docs/BranchProtection.md +++ b/docs/BranchProtection.md @@ -10,9 +10,12 @@ Name | Type | Description | Notes **blockOnOutdatedBranch** | **Boolean** | | [optional] **blockOnRejectedReviews** | **Boolean** | | [optional] **branchName** | **String** | Deprecated: true | [optional] +**bypassAllowlistTeams** | **List<String>** | | [optional] +**bypassAllowlistUsernames** | **List<String>** | | [optional] **createdAt** | [**Date**](Date.md) | | [optional] **dismissStaleApprovals** | **Boolean** | | [optional] **enableApprovalsWhitelist** | **Boolean** | | [optional] +**enableBypassAllowlist** | **Boolean** | | [optional] **enableForcePush** | **Boolean** | | [optional] **enableForcePushAllowlist** | **Boolean** | | [optional] **enableMergeWhitelist** | **Boolean** | | [optional] diff --git a/docs/CreateBranchProtectionOption.md b/docs/CreateBranchProtectionOption.md index c571342..a7d53c5 100644 --- a/docs/CreateBranchProtectionOption.md +++ b/docs/CreateBranchProtectionOption.md @@ -10,8 +10,11 @@ Name | Type | Description | Notes **blockOnOutdatedBranch** | **Boolean** | | [optional] **blockOnRejectedReviews** | **Boolean** | | [optional] **branchName** | **String** | Deprecated: true | [optional] +**bypassAllowlistTeams** | **List<String>** | | [optional] +**bypassAllowlistUsernames** | **List<String>** | | [optional] **dismissStaleApprovals** | **Boolean** | | [optional] **enableApprovalsWhitelist** | **Boolean** | | [optional] +**enableBypassAllowlist** | **Boolean** | | [optional] **enableForcePush** | **Boolean** | | [optional] **enableForcePushAllowlist** | **Boolean** | | [optional] **enableMergeWhitelist** | **Boolean** | | [optional] diff --git a/docs/EditBranchProtectionOption.md b/docs/EditBranchProtectionOption.md index 357d4a5..5e82f6a 100644 --- a/docs/EditBranchProtectionOption.md +++ b/docs/EditBranchProtectionOption.md @@ -9,8 +9,11 @@ Name | Type | Description | Notes **blockOnOfficialReviewRequests** | **Boolean** | | [optional] **blockOnOutdatedBranch** | **Boolean** | | [optional] **blockOnRejectedReviews** | **Boolean** | | [optional] +**bypassAllowlistTeams** | **List<String>** | | [optional] +**bypassAllowlistUsernames** | **List<String>** | | [optional] **dismissStaleApprovals** | **Boolean** | | [optional] **enableApprovalsWhitelist** | **Boolean** | | [optional] +**enableBypassAllowlist** | **Boolean** | | [optional] **enableForcePush** | **Boolean** | | [optional] **enableForcePushAllowlist** | **Boolean** | | [optional] **enableMergeWhitelist** | **Boolean** | | [optional] diff --git a/docs/EditRepoOption.md b/docs/EditRepoOption.md index b33d4fa..2cc31d6 100644 --- a/docs/EditRepoOption.md +++ b/docs/EditRepoOption.md @@ -6,6 +6,7 @@ Name | Type | Description | Notes **allowFastForwardOnlyMerge** | **Boolean** | either `true` to allow fast-forward-only merging pull requests, or `false` to prevent fast-forward-only merging. | [optional] **allowManualMerge** | **Boolean** | either `true` to allow mark pr as merged manually, or `false` to prevent it. | [optional] **allowMergeCommits** | **Boolean** | either `true` to allow merging pull requests with a merge commit, or `false` to prevent merging pull requests with merge commits. | [optional] +**allowMergeUpdate** | **Boolean** | either `true` to allow updating pull request branch by merge, or `false` to prevent it. | [optional] **allowRebase** | **Boolean** | either `true` to allow rebase-merging pull requests, or `false` to prevent rebase-merging. | [optional] **allowRebaseExplicit** | **Boolean** | either `true` to allow rebase with explicit merge commits (--no-ff), or `false` to prevent rebase with explicit merge commits. | [optional] **allowRebaseUpdate** | **Boolean** | either `true` to allow updating pull request branch by rebase, or `false` to prevent it. | [optional] @@ -16,6 +17,7 @@ Name | Type | Description | Notes **defaultBranch** | **String** | sets the default branch for this repository. | [optional] **defaultDeleteBranchAfterMerge** | **Boolean** | set to `true` to delete pr branch after merge by default | [optional] **defaultMergeStyle** | **String** | set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", \"squash\", or \"fast-forward-only\". | [optional] +**defaultUpdateStyle** | **String** | set to an update style to be used by this repository: \"merge\" or \"rebase\". | [optional] **description** | **String** | a short description of the repository. | [optional] **enablePrune** | **Boolean** | enable prune - remove obsolete remote-tracking references when mirroring | [optional] **externalTracker** | [**ExternalTracker**](ExternalTracker.md) | | [optional] diff --git a/docs/Repository.md b/docs/Repository.md index 7202211..8a622dd 100644 --- a/docs/Repository.md +++ b/docs/Repository.md @@ -6,6 +6,7 @@ Name | Type | Description | Notes **allowFastForwardOnlyMerge** | **Boolean** | | [optional] **allowManualMerge** | **Boolean** | | [optional] **allowMergeCommits** | **Boolean** | | [optional] +**allowMergeUpdate** | **Boolean** | | [optional] **allowRebase** | **Boolean** | | [optional] **allowRebaseExplicit** | **Boolean** | | [optional] **allowRebaseUpdate** | **Boolean** | | [optional] @@ -22,6 +23,7 @@ Name | Type | Description | Notes **defaultDeleteBranchAfterMerge** | **Boolean** | | [optional] **defaultMergeStyle** | **String** | | [optional] **defaultTargetBranch** | **String** | | [optional] +**defaultUpdateStyle** | **String** | | [optional] **description** | **String** | | [optional] **empty** | **Boolean** | | [optional] **externalTracker** | [**ExternalTracker**](ExternalTracker.md) | | [optional] diff --git a/src/main/java/org/gitnex/tea4j/v2/models/BranchProtection.java b/src/main/java/org/gitnex/tea4j/v2/models/BranchProtection.java index c429bdd..770485e 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/BranchProtection.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/BranchProtection.java @@ -46,6 +46,12 @@ public class BranchProtection implements Serializable { @SerializedName("branch_name") private String branchName = null; + @SerializedName("bypass_allowlist_teams") + private List bypassAllowlistTeams = null; + + @SerializedName("bypass_allowlist_usernames") + private List bypassAllowlistUsernames = null; + @SerializedName("created_at") private Date createdAt = null; @@ -55,6 +61,9 @@ public class BranchProtection implements Serializable { @SerializedName("enable_approvals_whitelist") private Boolean enableApprovalsWhitelist = null; + @SerializedName("enable_bypass_allowlist") + private Boolean enableBypassAllowlist = null; + @SerializedName("enable_force_push") private Boolean enableForcePush = null; @@ -273,6 +282,60 @@ public class BranchProtection implements Serializable { this.branchName = branchName; } + public BranchProtection bypassAllowlistTeams(List bypassAllowlistTeams) { + this.bypassAllowlistTeams = bypassAllowlistTeams; + return this; + } + + public BranchProtection addBypassAllowlistTeamsItem(String bypassAllowlistTeamsItem) { + if (this.bypassAllowlistTeams == null) { + this.bypassAllowlistTeams = new ArrayList<>(); + } + this.bypassAllowlistTeams.add(bypassAllowlistTeamsItem); + return this; + } + + /** + * Get bypassAllowlistTeams + * + * @return bypassAllowlistTeams + */ + @Schema(description = "") + public List getBypassAllowlistTeams() { + return bypassAllowlistTeams; + } + + public void setBypassAllowlistTeams(List bypassAllowlistTeams) { + this.bypassAllowlistTeams = bypassAllowlistTeams; + } + + public BranchProtection bypassAllowlistUsernames(List bypassAllowlistUsernames) { + this.bypassAllowlistUsernames = bypassAllowlistUsernames; + return this; + } + + public BranchProtection addBypassAllowlistUsernamesItem(String bypassAllowlistUsernamesItem) { + if (this.bypassAllowlistUsernames == null) { + this.bypassAllowlistUsernames = new ArrayList<>(); + } + this.bypassAllowlistUsernames.add(bypassAllowlistUsernamesItem); + return this; + } + + /** + * Get bypassAllowlistUsernames + * + * @return bypassAllowlistUsernames + */ + @Schema(description = "") + public List getBypassAllowlistUsernames() { + return bypassAllowlistUsernames; + } + + public void setBypassAllowlistUsernames(List bypassAllowlistUsernames) { + this.bypassAllowlistUsernames = bypassAllowlistUsernames; + } + public BranchProtection createdAt(Date createdAt) { this.createdAt = createdAt; return this; @@ -330,6 +393,25 @@ public class BranchProtection implements Serializable { this.enableApprovalsWhitelist = enableApprovalsWhitelist; } + public BranchProtection enableBypassAllowlist(Boolean enableBypassAllowlist) { + this.enableBypassAllowlist = enableBypassAllowlist; + return this; + } + + /** + * Get enableBypassAllowlist + * + * @return enableBypassAllowlist + */ + @Schema(description = "") + public Boolean isEnableBypassAllowlist() { + return enableBypassAllowlist; + } + + public void setEnableBypassAllowlist(Boolean enableBypassAllowlist) { + this.enableBypassAllowlist = enableBypassAllowlist; + } + public BranchProtection enableForcePush(Boolean enableForcePush) { this.enableForcePush = enableForcePush; return this; @@ -842,9 +924,12 @@ public class BranchProtection implements Serializable { && Objects.equals(this.blockOnOutdatedBranch, branchProtection.blockOnOutdatedBranch) && Objects.equals(this.blockOnRejectedReviews, branchProtection.blockOnRejectedReviews) && Objects.equals(this.branchName, branchProtection.branchName) + && Objects.equals(this.bypassAllowlistTeams, branchProtection.bypassAllowlistTeams) + && Objects.equals(this.bypassAllowlistUsernames, branchProtection.bypassAllowlistUsernames) && Objects.equals(this.createdAt, branchProtection.createdAt) && Objects.equals(this.dismissStaleApprovals, branchProtection.dismissStaleApprovals) && Objects.equals(this.enableApprovalsWhitelist, branchProtection.enableApprovalsWhitelist) + && Objects.equals(this.enableBypassAllowlist, branchProtection.enableBypassAllowlist) && Objects.equals(this.enableForcePush, branchProtection.enableForcePush) && Objects.equals(this.enableForcePushAllowlist, branchProtection.enableForcePushAllowlist) && Objects.equals(this.enableMergeWhitelist, branchProtection.enableMergeWhitelist) @@ -882,9 +967,12 @@ public class BranchProtection implements Serializable { blockOnOutdatedBranch, blockOnRejectedReviews, branchName, + bypassAllowlistTeams, + bypassAllowlistUsernames, createdAt, dismissStaleApprovals, enableApprovalsWhitelist, + enableBypassAllowlist, enableForcePush, enableForcePushAllowlist, enableMergeWhitelist, @@ -934,6 +1022,12 @@ public class BranchProtection implements Serializable { .append(toIndentedString(blockOnRejectedReviews)) .append("\n"); sb.append(" branchName: ").append(toIndentedString(branchName)).append("\n"); + sb.append(" bypassAllowlistTeams: ") + .append(toIndentedString(bypassAllowlistTeams)) + .append("\n"); + sb.append(" bypassAllowlistUsernames: ") + .append(toIndentedString(bypassAllowlistUsernames)) + .append("\n"); sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); sb.append(" dismissStaleApprovals: ") .append(toIndentedString(dismissStaleApprovals)) @@ -941,6 +1035,9 @@ public class BranchProtection implements Serializable { sb.append(" enableApprovalsWhitelist: ") .append(toIndentedString(enableApprovalsWhitelist)) .append("\n"); + sb.append(" enableBypassAllowlist: ") + .append(toIndentedString(enableBypassAllowlist)) + .append("\n"); sb.append(" enableForcePush: ").append(toIndentedString(enableForcePush)).append("\n"); sb.append(" enableForcePushAllowlist: ") .append(toIndentedString(enableForcePushAllowlist)) diff --git a/src/main/java/org/gitnex/tea4j/v2/models/CreateBranchProtectionOption.java b/src/main/java/org/gitnex/tea4j/v2/models/CreateBranchProtectionOption.java index 3d613be..464563d 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/CreateBranchProtectionOption.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/CreateBranchProtectionOption.java @@ -45,12 +45,21 @@ public class CreateBranchProtectionOption implements Serializable { @SerializedName("branch_name") private String branchName = null; + @SerializedName("bypass_allowlist_teams") + private List bypassAllowlistTeams = null; + + @SerializedName("bypass_allowlist_usernames") + private List bypassAllowlistUsernames = null; + @SerializedName("dismiss_stale_approvals") private Boolean dismissStaleApprovals = null; @SerializedName("enable_approvals_whitelist") private Boolean enableApprovalsWhitelist = null; + @SerializedName("enable_bypass_allowlist") + private Boolean enableBypassAllowlist = null; + @SerializedName("enable_force_push") private Boolean enableForcePush = null; @@ -271,6 +280,62 @@ public class CreateBranchProtectionOption implements Serializable { this.branchName = branchName; } + public CreateBranchProtectionOption bypassAllowlistTeams(List bypassAllowlistTeams) { + this.bypassAllowlistTeams = bypassAllowlistTeams; + return this; + } + + public CreateBranchProtectionOption addBypassAllowlistTeamsItem(String bypassAllowlistTeamsItem) { + if (this.bypassAllowlistTeams == null) { + this.bypassAllowlistTeams = new ArrayList<>(); + } + this.bypassAllowlistTeams.add(bypassAllowlistTeamsItem); + return this; + } + + /** + * Get bypassAllowlistTeams + * + * @return bypassAllowlistTeams + */ + @Schema(description = "") + public List getBypassAllowlistTeams() { + return bypassAllowlistTeams; + } + + public void setBypassAllowlistTeams(List bypassAllowlistTeams) { + this.bypassAllowlistTeams = bypassAllowlistTeams; + } + + public CreateBranchProtectionOption bypassAllowlistUsernames( + List bypassAllowlistUsernames) { + this.bypassAllowlistUsernames = bypassAllowlistUsernames; + return this; + } + + public CreateBranchProtectionOption addBypassAllowlistUsernamesItem( + String bypassAllowlistUsernamesItem) { + if (this.bypassAllowlistUsernames == null) { + this.bypassAllowlistUsernames = new ArrayList<>(); + } + this.bypassAllowlistUsernames.add(bypassAllowlistUsernamesItem); + return this; + } + + /** + * Get bypassAllowlistUsernames + * + * @return bypassAllowlistUsernames + */ + @Schema(description = "") + public List getBypassAllowlistUsernames() { + return bypassAllowlistUsernames; + } + + public void setBypassAllowlistUsernames(List bypassAllowlistUsernames) { + this.bypassAllowlistUsernames = bypassAllowlistUsernames; + } + public CreateBranchProtectionOption dismissStaleApprovals(Boolean dismissStaleApprovals) { this.dismissStaleApprovals = dismissStaleApprovals; return this; @@ -309,6 +374,25 @@ public class CreateBranchProtectionOption implements Serializable { this.enableApprovalsWhitelist = enableApprovalsWhitelist; } + public CreateBranchProtectionOption enableBypassAllowlist(Boolean enableBypassAllowlist) { + this.enableBypassAllowlist = enableBypassAllowlist; + return this; + } + + /** + * Get enableBypassAllowlist + * + * @return enableBypassAllowlist + */ + @Schema(description = "") + public Boolean isEnableBypassAllowlist() { + return enableBypassAllowlist; + } + + public void setEnableBypassAllowlist(Boolean enableBypassAllowlist) { + this.enableBypassAllowlist = enableBypassAllowlist; + } + public CreateBranchProtectionOption enableForcePush(Boolean enableForcePush) { this.enableForcePush = enableForcePush; return this; @@ -815,10 +899,16 @@ public class CreateBranchProtectionOption implements Serializable { && Objects.equals( this.blockOnRejectedReviews, createBranchProtectionOption.blockOnRejectedReviews) && Objects.equals(this.branchName, createBranchProtectionOption.branchName) + && Objects.equals( + this.bypassAllowlistTeams, createBranchProtectionOption.bypassAllowlistTeams) + && Objects.equals( + this.bypassAllowlistUsernames, createBranchProtectionOption.bypassAllowlistUsernames) && Objects.equals( this.dismissStaleApprovals, createBranchProtectionOption.dismissStaleApprovals) && Objects.equals( this.enableApprovalsWhitelist, createBranchProtectionOption.enableApprovalsWhitelist) + && Objects.equals( + this.enableBypassAllowlist, createBranchProtectionOption.enableBypassAllowlist) && Objects.equals(this.enableForcePush, createBranchProtectionOption.enableForcePush) && Objects.equals( this.enableForcePushAllowlist, createBranchProtectionOption.enableForcePushAllowlist) @@ -870,8 +960,11 @@ public class CreateBranchProtectionOption implements Serializable { blockOnOutdatedBranch, blockOnRejectedReviews, branchName, + bypassAllowlistTeams, + bypassAllowlistUsernames, dismissStaleApprovals, enableApprovalsWhitelist, + enableBypassAllowlist, enableForcePush, enableForcePushAllowlist, enableMergeWhitelist, @@ -920,12 +1013,21 @@ public class CreateBranchProtectionOption implements Serializable { .append(toIndentedString(blockOnRejectedReviews)) .append("\n"); sb.append(" branchName: ").append(toIndentedString(branchName)).append("\n"); + sb.append(" bypassAllowlistTeams: ") + .append(toIndentedString(bypassAllowlistTeams)) + .append("\n"); + sb.append(" bypassAllowlistUsernames: ") + .append(toIndentedString(bypassAllowlistUsernames)) + .append("\n"); sb.append(" dismissStaleApprovals: ") .append(toIndentedString(dismissStaleApprovals)) .append("\n"); sb.append(" enableApprovalsWhitelist: ") .append(toIndentedString(enableApprovalsWhitelist)) .append("\n"); + sb.append(" enableBypassAllowlist: ") + .append(toIndentedString(enableBypassAllowlist)) + .append("\n"); sb.append(" enableForcePush: ").append(toIndentedString(enableForcePush)).append("\n"); sb.append(" enableForcePushAllowlist: ") .append(toIndentedString(enableForcePushAllowlist)) diff --git a/src/main/java/org/gitnex/tea4j/v2/models/EditBranchProtectionOption.java b/src/main/java/org/gitnex/tea4j/v2/models/EditBranchProtectionOption.java index 662ae5c..659b8cc 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/EditBranchProtectionOption.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/EditBranchProtectionOption.java @@ -42,12 +42,21 @@ public class EditBranchProtectionOption implements Serializable { @SerializedName("block_on_rejected_reviews") private Boolean blockOnRejectedReviews = null; + @SerializedName("bypass_allowlist_teams") + private List bypassAllowlistTeams = null; + + @SerializedName("bypass_allowlist_usernames") + private List bypassAllowlistUsernames = null; + @SerializedName("dismiss_stale_approvals") private Boolean dismissStaleApprovals = null; @SerializedName("enable_approvals_whitelist") private Boolean enableApprovalsWhitelist = null; + @SerializedName("enable_bypass_allowlist") + private Boolean enableBypassAllowlist = null; + @SerializedName("enable_force_push") private Boolean enableForcePush = null; @@ -245,6 +254,62 @@ public class EditBranchProtectionOption implements Serializable { this.blockOnRejectedReviews = blockOnRejectedReviews; } + public EditBranchProtectionOption bypassAllowlistTeams(List bypassAllowlistTeams) { + this.bypassAllowlistTeams = bypassAllowlistTeams; + return this; + } + + public EditBranchProtectionOption addBypassAllowlistTeamsItem(String bypassAllowlistTeamsItem) { + if (this.bypassAllowlistTeams == null) { + this.bypassAllowlistTeams = new ArrayList<>(); + } + this.bypassAllowlistTeams.add(bypassAllowlistTeamsItem); + return this; + } + + /** + * Get bypassAllowlistTeams + * + * @return bypassAllowlistTeams + */ + @Schema(description = "") + public List getBypassAllowlistTeams() { + return bypassAllowlistTeams; + } + + public void setBypassAllowlistTeams(List bypassAllowlistTeams) { + this.bypassAllowlistTeams = bypassAllowlistTeams; + } + + public EditBranchProtectionOption bypassAllowlistUsernames( + List bypassAllowlistUsernames) { + this.bypassAllowlistUsernames = bypassAllowlistUsernames; + return this; + } + + public EditBranchProtectionOption addBypassAllowlistUsernamesItem( + String bypassAllowlistUsernamesItem) { + if (this.bypassAllowlistUsernames == null) { + this.bypassAllowlistUsernames = new ArrayList<>(); + } + this.bypassAllowlistUsernames.add(bypassAllowlistUsernamesItem); + return this; + } + + /** + * Get bypassAllowlistUsernames + * + * @return bypassAllowlistUsernames + */ + @Schema(description = "") + public List getBypassAllowlistUsernames() { + return bypassAllowlistUsernames; + } + + public void setBypassAllowlistUsernames(List bypassAllowlistUsernames) { + this.bypassAllowlistUsernames = bypassAllowlistUsernames; + } + public EditBranchProtectionOption dismissStaleApprovals(Boolean dismissStaleApprovals) { this.dismissStaleApprovals = dismissStaleApprovals; return this; @@ -283,6 +348,25 @@ public class EditBranchProtectionOption implements Serializable { this.enableApprovalsWhitelist = enableApprovalsWhitelist; } + public EditBranchProtectionOption enableBypassAllowlist(Boolean enableBypassAllowlist) { + this.enableBypassAllowlist = enableBypassAllowlist; + return this; + } + + /** + * Get enableBypassAllowlist + * + * @return enableBypassAllowlist + */ + @Schema(description = "") + public Boolean isEnableBypassAllowlist() { + return enableBypassAllowlist; + } + + public void setEnableBypassAllowlist(Boolean enableBypassAllowlist) { + this.enableBypassAllowlist = enableBypassAllowlist; + } + public EditBranchProtectionOption enableForcePush(Boolean enableForcePush) { this.enableForcePush = enableForcePush; return this; @@ -766,10 +850,16 @@ public class EditBranchProtectionOption implements Serializable { this.blockOnOutdatedBranch, editBranchProtectionOption.blockOnOutdatedBranch) && Objects.equals( this.blockOnRejectedReviews, editBranchProtectionOption.blockOnRejectedReviews) + && Objects.equals( + this.bypassAllowlistTeams, editBranchProtectionOption.bypassAllowlistTeams) + && Objects.equals( + this.bypassAllowlistUsernames, editBranchProtectionOption.bypassAllowlistUsernames) && Objects.equals( this.dismissStaleApprovals, editBranchProtectionOption.dismissStaleApprovals) && Objects.equals( this.enableApprovalsWhitelist, editBranchProtectionOption.enableApprovalsWhitelist) + && Objects.equals( + this.enableBypassAllowlist, editBranchProtectionOption.enableBypassAllowlist) && Objects.equals(this.enableForcePush, editBranchProtectionOption.enableForcePush) && Objects.equals( this.enableForcePushAllowlist, editBranchProtectionOption.enableForcePushAllowlist) @@ -816,8 +906,11 @@ public class EditBranchProtectionOption implements Serializable { blockOnOfficialReviewRequests, blockOnOutdatedBranch, blockOnRejectedReviews, + bypassAllowlistTeams, + bypassAllowlistUsernames, dismissStaleApprovals, enableApprovalsWhitelist, + enableBypassAllowlist, enableForcePush, enableForcePushAllowlist, enableMergeWhitelist, @@ -864,12 +957,21 @@ public class EditBranchProtectionOption implements Serializable { sb.append(" blockOnRejectedReviews: ") .append(toIndentedString(blockOnRejectedReviews)) .append("\n"); + sb.append(" bypassAllowlistTeams: ") + .append(toIndentedString(bypassAllowlistTeams)) + .append("\n"); + sb.append(" bypassAllowlistUsernames: ") + .append(toIndentedString(bypassAllowlistUsernames)) + .append("\n"); sb.append(" dismissStaleApprovals: ") .append(toIndentedString(dismissStaleApprovals)) .append("\n"); sb.append(" enableApprovalsWhitelist: ") .append(toIndentedString(enableApprovalsWhitelist)) .append("\n"); + sb.append(" enableBypassAllowlist: ") + .append(toIndentedString(enableBypassAllowlist)) + .append("\n"); sb.append(" enableForcePush: ").append(toIndentedString(enableForcePush)).append("\n"); sb.append(" enableForcePushAllowlist: ") .append(toIndentedString(enableForcePushAllowlist)) diff --git a/src/main/java/org/gitnex/tea4j/v2/models/EditRepoOption.java b/src/main/java/org/gitnex/tea4j/v2/models/EditRepoOption.java index 09b1e8b..9974ac9 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/EditRepoOption.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/EditRepoOption.java @@ -31,6 +31,9 @@ public class EditRepoOption implements Serializable { @SerializedName("allow_merge_commits") private Boolean allowMergeCommits = null; + @SerializedName("allow_merge_update") + private Boolean allowMergeUpdate = null; + @SerializedName("allow_rebase") private Boolean allowRebase = null; @@ -61,6 +64,9 @@ public class EditRepoOption implements Serializable { @SerializedName("default_merge_style") private String defaultMergeStyle = null; + @SerializedName("default_update_style") + private String defaultUpdateStyle = null; + @SerializedName("description") private String description = null; @@ -197,6 +203,28 @@ public class EditRepoOption implements Serializable { this.allowMergeCommits = allowMergeCommits; } + public EditRepoOption allowMergeUpdate(Boolean allowMergeUpdate) { + this.allowMergeUpdate = allowMergeUpdate; + return this; + } + + /** + * either `true` to allow updating pull request branch by merge, or `false` to + * prevent it. + * + * @return allowMergeUpdate + */ + @Schema( + description = + "either `true` to allow updating pull request branch by merge, or `false` to prevent it.") + public Boolean isAllowMergeUpdate() { + return allowMergeUpdate; + } + + public void setAllowMergeUpdate(Boolean allowMergeUpdate) { + this.allowMergeUpdate = allowMergeUpdate; + } + public EditRepoOption allowRebase(Boolean allowRebase) { this.allowRebase = allowRebase; return this; @@ -411,6 +439,28 @@ public class EditRepoOption implements Serializable { this.defaultMergeStyle = defaultMergeStyle; } + public EditRepoOption defaultUpdateStyle(String defaultUpdateStyle) { + this.defaultUpdateStyle = defaultUpdateStyle; + return this; + } + + /** + * set to an update style to be used by this repository: \"merge\" or + * \"rebase\". + * + * @return defaultUpdateStyle + */ + @Schema( + description = + "set to an update style to be used by this repository: \"merge\" or \"rebase\".") + public String getDefaultUpdateStyle() { + return defaultUpdateStyle; + } + + public void setDefaultUpdateStyle(String defaultUpdateStyle) { + this.defaultUpdateStyle = defaultUpdateStyle; + } + public EditRepoOption description(String description) { this.description = description; return this; @@ -884,6 +934,7 @@ public class EditRepoOption implements Serializable { return Objects.equals(this.allowFastForwardOnlyMerge, editRepoOption.allowFastForwardOnlyMerge) && Objects.equals(this.allowManualMerge, editRepoOption.allowManualMerge) && Objects.equals(this.allowMergeCommits, editRepoOption.allowMergeCommits) + && Objects.equals(this.allowMergeUpdate, editRepoOption.allowMergeUpdate) && Objects.equals(this.allowRebase, editRepoOption.allowRebase) && Objects.equals(this.allowRebaseExplicit, editRepoOption.allowRebaseExplicit) && Objects.equals(this.allowRebaseUpdate, editRepoOption.allowRebaseUpdate) @@ -896,6 +947,7 @@ public class EditRepoOption implements Serializable { && Objects.equals( this.defaultDeleteBranchAfterMerge, editRepoOption.defaultDeleteBranchAfterMerge) && Objects.equals(this.defaultMergeStyle, editRepoOption.defaultMergeStyle) + && Objects.equals(this.defaultUpdateStyle, editRepoOption.defaultUpdateStyle) && Objects.equals(this.description, editRepoOption.description) && Objects.equals(this.enablePrune, editRepoOption.enablePrune) && Objects.equals(this.externalTracker, editRepoOption.externalTracker) @@ -927,6 +979,7 @@ public class EditRepoOption implements Serializable { allowFastForwardOnlyMerge, allowManualMerge, allowMergeCommits, + allowMergeUpdate, allowRebase, allowRebaseExplicit, allowRebaseUpdate, @@ -937,6 +990,7 @@ public class EditRepoOption implements Serializable { defaultBranch, defaultDeleteBranchAfterMerge, defaultMergeStyle, + defaultUpdateStyle, description, enablePrune, externalTracker, @@ -972,6 +1026,7 @@ public class EditRepoOption implements Serializable { .append("\n"); sb.append(" allowManualMerge: ").append(toIndentedString(allowManualMerge)).append("\n"); sb.append(" allowMergeCommits: ").append(toIndentedString(allowMergeCommits)).append("\n"); + sb.append(" allowMergeUpdate: ").append(toIndentedString(allowMergeUpdate)).append("\n"); sb.append(" allowRebase: ").append(toIndentedString(allowRebase)).append("\n"); sb.append(" allowRebaseExplicit: ") .append(toIndentedString(allowRebaseExplicit)) @@ -990,6 +1045,7 @@ public class EditRepoOption implements Serializable { .append(toIndentedString(defaultDeleteBranchAfterMerge)) .append("\n"); sb.append(" defaultMergeStyle: ").append(toIndentedString(defaultMergeStyle)).append("\n"); + sb.append(" defaultUpdateStyle: ").append(toIndentedString(defaultUpdateStyle)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); sb.append(" enablePrune: ").append(toIndentedString(enablePrune)).append("\n"); sb.append(" externalTracker: ").append(toIndentedString(externalTracker)).append("\n"); diff --git a/src/main/java/org/gitnex/tea4j/v2/models/Repository.java b/src/main/java/org/gitnex/tea4j/v2/models/Repository.java index d102dc0..e8d530c 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/Repository.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/Repository.java @@ -39,6 +39,9 @@ public class Repository implements Serializable { @SerializedName("allow_merge_commits") private Boolean allowMergeCommits = null; + @SerializedName("allow_merge_update") + private Boolean allowMergeUpdate = null; + @SerializedName("allow_rebase") private Boolean allowRebase = null; @@ -87,6 +90,9 @@ public class Repository implements Serializable { @SerializedName("default_target_branch") private String defaultTargetBranch = null; + @SerializedName("default_update_style") + private String defaultUpdateStyle = null; + @SerializedName("description") private String description = null; @@ -339,6 +345,25 @@ public class Repository implements Serializable { this.allowMergeCommits = allowMergeCommits; } + public Repository allowMergeUpdate(Boolean allowMergeUpdate) { + this.allowMergeUpdate = allowMergeUpdate; + return this; + } + + /** + * Get allowMergeUpdate + * + * @return allowMergeUpdate + */ + @Schema(description = "") + public Boolean isAllowMergeUpdate() { + return allowMergeUpdate; + } + + public void setAllowMergeUpdate(Boolean allowMergeUpdate) { + this.allowMergeUpdate = allowMergeUpdate; + } + public Repository allowRebase(Boolean allowRebase) { this.allowRebase = allowRebase; return this; @@ -643,6 +668,25 @@ public class Repository implements Serializable { this.defaultTargetBranch = defaultTargetBranch; } + public Repository defaultUpdateStyle(String defaultUpdateStyle) { + this.defaultUpdateStyle = defaultUpdateStyle; + return this; + } + + /** + * Get defaultUpdateStyle + * + * @return defaultUpdateStyle + */ + @Schema(description = "") + public String getDefaultUpdateStyle() { + return defaultUpdateStyle; + } + + public void setDefaultUpdateStyle(String defaultUpdateStyle) { + this.defaultUpdateStyle = defaultUpdateStyle; + } + public Repository description(String description) { this.description = description; return this; @@ -1606,6 +1650,7 @@ public class Repository implements Serializable { return Objects.equals(this.allowFastForwardOnlyMerge, repository.allowFastForwardOnlyMerge) && Objects.equals(this.allowManualMerge, repository.allowManualMerge) && Objects.equals(this.allowMergeCommits, repository.allowMergeCommits) + && Objects.equals(this.allowMergeUpdate, repository.allowMergeUpdate) && Objects.equals(this.allowRebase, repository.allowRebase) && Objects.equals(this.allowRebaseExplicit, repository.allowRebaseExplicit) && Objects.equals(this.allowRebaseUpdate, repository.allowRebaseUpdate) @@ -1623,6 +1668,7 @@ public class Repository implements Serializable { this.defaultDeleteBranchAfterMerge, repository.defaultDeleteBranchAfterMerge) && Objects.equals(this.defaultMergeStyle, repository.defaultMergeStyle) && Objects.equals(this.defaultTargetBranch, repository.defaultTargetBranch) + && Objects.equals(this.defaultUpdateStyle, repository.defaultUpdateStyle) && Objects.equals(this.description, repository.description) && Objects.equals(this.empty, repository.empty) && Objects.equals(this.externalTracker, repository.externalTracker) @@ -1680,6 +1726,7 @@ public class Repository implements Serializable { allowFastForwardOnlyMerge, allowManualMerge, allowMergeCommits, + allowMergeUpdate, allowRebase, allowRebaseExplicit, allowRebaseUpdate, @@ -1696,6 +1743,7 @@ public class Repository implements Serializable { defaultDeleteBranchAfterMerge, defaultMergeStyle, defaultTargetBranch, + defaultUpdateStyle, description, empty, externalTracker, @@ -1757,6 +1805,7 @@ public class Repository implements Serializable { .append("\n"); sb.append(" allowManualMerge: ").append(toIndentedString(allowManualMerge)).append("\n"); sb.append(" allowMergeCommits: ").append(toIndentedString(allowMergeCommits)).append("\n"); + sb.append(" allowMergeUpdate: ").append(toIndentedString(allowMergeUpdate)).append("\n"); sb.append(" allowRebase: ").append(toIndentedString(allowRebase)).append("\n"); sb.append(" allowRebaseExplicit: ") .append(toIndentedString(allowRebaseExplicit)) @@ -1783,6 +1832,7 @@ public class Repository implements Serializable { sb.append(" defaultTargetBranch: ") .append(toIndentedString(defaultTargetBranch)) .append("\n"); + sb.append(" defaultUpdateStyle: ").append(toIndentedString(defaultUpdateStyle)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); sb.append(" empty: ").append(toIndentedString(empty)).append("\n"); sb.append(" externalTracker: ").append(toIndentedString(externalTracker)).append("\n");