diff --git a/docs/BranchProtection.md b/docs/BranchProtection.md index 7e0b192..417cc61 100644 --- a/docs/BranchProtection.md +++ b/docs/BranchProtection.md @@ -5,6 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **approvalsWhitelistTeams** | **List<String>** | | [optional] **approvalsWhitelistUsername** | **List<String>** | | [optional] +**blockAdminMergeOverride** | **Boolean** | | [optional] **blockOnOfficialReviewRequests** | **Boolean** | | [optional] **blockOnOutdatedBranch** | **Boolean** | | [optional] **blockOnRejectedReviews** | **Boolean** | | [optional] diff --git a/docs/CreateBranchProtectionOption.md b/docs/CreateBranchProtectionOption.md index 3820b3c..61f3185 100644 --- a/docs/CreateBranchProtectionOption.md +++ b/docs/CreateBranchProtectionOption.md @@ -5,6 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **approvalsWhitelistTeams** | **List<String>** | | [optional] **approvalsWhitelistUsername** | **List<String>** | | [optional] +**blockAdminMergeOverride** | **Boolean** | | [optional] **blockOnOfficialReviewRequests** | **Boolean** | | [optional] **blockOnOutdatedBranch** | **Boolean** | | [optional] **blockOnRejectedReviews** | **Boolean** | | [optional] diff --git a/docs/EditBranchProtectionOption.md b/docs/EditBranchProtectionOption.md index 541eed7..84ea16d 100644 --- a/docs/EditBranchProtectionOption.md +++ b/docs/EditBranchProtectionOption.md @@ -5,6 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **approvalsWhitelistTeams** | **List<String>** | | [optional] **approvalsWhitelistUsername** | **List<String>** | | [optional] +**blockAdminMergeOverride** | **Boolean** | | [optional] **blockOnOfficialReviewRequests** | **Boolean** | | [optional] **blockOnOutdatedBranch** | **Boolean** | | [optional] **blockOnRejectedReviews** | **Boolean** | | [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 2d0afef..2387fa4 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/BranchProtection.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/BranchProtection.java @@ -31,6 +31,9 @@ public class BranchProtection implements Serializable { @SerializedName("approvals_whitelist_username") private List approvalsWhitelistUsername = null; + @SerializedName("block_admin_merge_override") + private Boolean blockAdminMergeOverride = null; + @SerializedName("block_on_official_review_requests") private Boolean blockOnOfficialReviewRequests = null; @@ -172,6 +175,25 @@ public class BranchProtection implements Serializable { this.approvalsWhitelistUsername = approvalsWhitelistUsername; } + public BranchProtection blockAdminMergeOverride(Boolean blockAdminMergeOverride) { + this.blockAdminMergeOverride = blockAdminMergeOverride; + return this; + } + + /** + * Get blockAdminMergeOverride + * + * @return blockAdminMergeOverride + */ + @Schema(description = "") + public Boolean isBlockAdminMergeOverride() { + return blockAdminMergeOverride; + } + + public void setBlockAdminMergeOverride(Boolean blockAdminMergeOverride) { + this.blockAdminMergeOverride = blockAdminMergeOverride; + } + public BranchProtection blockOnOfficialReviewRequests(Boolean blockOnOfficialReviewRequests) { this.blockOnOfficialReviewRequests = blockOnOfficialReviewRequests; return this; @@ -792,6 +814,7 @@ public class BranchProtection implements Serializable { return Objects.equals(this.approvalsWhitelistTeams, branchProtection.approvalsWhitelistTeams) && Objects.equals( this.approvalsWhitelistUsername, branchProtection.approvalsWhitelistUsername) + && Objects.equals(this.blockAdminMergeOverride, branchProtection.blockAdminMergeOverride) && Objects.equals( this.blockOnOfficialReviewRequests, branchProtection.blockOnOfficialReviewRequests) && Objects.equals(this.blockOnOutdatedBranch, branchProtection.blockOnOutdatedBranch) @@ -831,6 +854,7 @@ public class BranchProtection implements Serializable { return Objects.hash( approvalsWhitelistTeams, approvalsWhitelistUsername, + blockAdminMergeOverride, blockOnOfficialReviewRequests, blockOnOutdatedBranch, blockOnRejectedReviews, @@ -873,6 +897,9 @@ public class BranchProtection implements Serializable { sb.append(" approvalsWhitelistUsername: ") .append(toIndentedString(approvalsWhitelistUsername)) .append("\n"); + sb.append(" blockAdminMergeOverride: ") + .append(toIndentedString(blockAdminMergeOverride)) + .append("\n"); sb.append(" blockOnOfficialReviewRequests: ") .append(toIndentedString(blockOnOfficialReviewRequests)) .append("\n"); 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 95180bf..cf0fa03 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/CreateBranchProtectionOption.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/CreateBranchProtectionOption.java @@ -30,6 +30,9 @@ public class CreateBranchProtectionOption implements Serializable { @SerializedName("approvals_whitelist_username") private List approvalsWhitelistUsername = null; + @SerializedName("block_admin_merge_override") + private Boolean blockAdminMergeOverride = null; + @SerializedName("block_on_official_review_requests") private Boolean blockOnOfficialReviewRequests = null; @@ -169,6 +172,25 @@ public class CreateBranchProtectionOption implements Serializable { this.approvalsWhitelistUsername = approvalsWhitelistUsername; } + public CreateBranchProtectionOption blockAdminMergeOverride(Boolean blockAdminMergeOverride) { + this.blockAdminMergeOverride = blockAdminMergeOverride; + return this; + } + + /** + * Get blockAdminMergeOverride + * + * @return blockAdminMergeOverride + */ + @Schema(description = "") + public Boolean isBlockAdminMergeOverride() { + return blockAdminMergeOverride; + } + + public void setBlockAdminMergeOverride(Boolean blockAdminMergeOverride) { + this.blockAdminMergeOverride = blockAdminMergeOverride; + } + public CreateBranchProtectionOption blockOnOfficialReviewRequests( Boolean blockOnOfficialReviewRequests) { this.blockOnOfficialReviewRequests = blockOnOfficialReviewRequests; @@ -761,6 +783,8 @@ public class CreateBranchProtectionOption implements Serializable { && Objects.equals( this.approvalsWhitelistUsername, createBranchProtectionOption.approvalsWhitelistUsername) + && Objects.equals( + this.blockAdminMergeOverride, createBranchProtectionOption.blockAdminMergeOverride) && Objects.equals( this.blockOnOfficialReviewRequests, createBranchProtectionOption.blockOnOfficialReviewRequests) @@ -818,6 +842,7 @@ public class CreateBranchProtectionOption implements Serializable { return Objects.hash( approvalsWhitelistTeams, approvalsWhitelistUsername, + blockAdminMergeOverride, blockOnOfficialReviewRequests, blockOnOutdatedBranch, blockOnRejectedReviews, @@ -858,6 +883,9 @@ public class CreateBranchProtectionOption implements Serializable { sb.append(" approvalsWhitelistUsername: ") .append(toIndentedString(approvalsWhitelistUsername)) .append("\n"); + sb.append(" blockAdminMergeOverride: ") + .append(toIndentedString(blockAdminMergeOverride)) + .append("\n"); sb.append(" blockOnOfficialReviewRequests: ") .append(toIndentedString(blockOnOfficialReviewRequests)) .append("\n"); 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 a64bde3..7ad308e 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/EditBranchProtectionOption.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/EditBranchProtectionOption.java @@ -30,6 +30,9 @@ public class EditBranchProtectionOption implements Serializable { @SerializedName("approvals_whitelist_username") private List approvalsWhitelistUsername = null; + @SerializedName("block_admin_merge_override") + private Boolean blockAdminMergeOverride = null; + @SerializedName("block_on_official_review_requests") private Boolean blockOnOfficialReviewRequests = null; @@ -162,6 +165,25 @@ public class EditBranchProtectionOption implements Serializable { this.approvalsWhitelistUsername = approvalsWhitelistUsername; } + public EditBranchProtectionOption blockAdminMergeOverride(Boolean blockAdminMergeOverride) { + this.blockAdminMergeOverride = blockAdminMergeOverride; + return this; + } + + /** + * Get blockAdminMergeOverride + * + * @return blockAdminMergeOverride + */ + @Schema(description = "") + public Boolean isBlockAdminMergeOverride() { + return blockAdminMergeOverride; + } + + public void setBlockAdminMergeOverride(Boolean blockAdminMergeOverride) { + this.blockAdminMergeOverride = blockAdminMergeOverride; + } + public EditBranchProtectionOption blockOnOfficialReviewRequests( Boolean blockOnOfficialReviewRequests) { this.blockOnOfficialReviewRequests = blockOnOfficialReviewRequests; @@ -713,6 +735,8 @@ public class EditBranchProtectionOption implements Serializable { this.approvalsWhitelistTeams, editBranchProtectionOption.approvalsWhitelistTeams) && Objects.equals( this.approvalsWhitelistUsername, editBranchProtectionOption.approvalsWhitelistUsername) + && Objects.equals( + this.blockAdminMergeOverride, editBranchProtectionOption.blockAdminMergeOverride) && Objects.equals( this.blockOnOfficialReviewRequests, editBranchProtectionOption.blockOnOfficialReviewRequests) @@ -765,6 +789,7 @@ public class EditBranchProtectionOption implements Serializable { return Objects.hash( approvalsWhitelistTeams, approvalsWhitelistUsername, + blockAdminMergeOverride, blockOnOfficialReviewRequests, blockOnOutdatedBranch, blockOnRejectedReviews, @@ -803,6 +828,9 @@ public class EditBranchProtectionOption implements Serializable { sb.append(" approvalsWhitelistUsername: ") .append(toIndentedString(approvalsWhitelistUsername)) .append("\n"); + sb.append(" blockAdminMergeOverride: ") + .append(toIndentedString(blockAdminMergeOverride)) + .append("\n"); sb.append(" blockOnOfficialReviewRequests: ") .append(toIndentedString(blockOnOfficialReviewRequests)) .append("\n");