Merge branch 'main' into files

This commit is contained in:
qwerty287
2022-07-20 14:23:49 +02:00
8 changed files with 110 additions and 4 deletions
+1
View File
@@ -4,3 +4,4 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**message** | **String** | | [optional]
**priors** | **Boolean** | | [optional]
+1 -1
View File
@@ -10,7 +10,7 @@ Method | HTTP request | Description
[**orgAddTeamRepository**](OrganizationApi.md#orgAddTeamRepository) | **PUT** teams/{id}/repos/{org}/{repo} | Add a repository to a team
[**orgConcealMember**](OrganizationApi.md#orgConcealMember) | **DELETE** orgs/{org}/public_members/{username} | Conceal a user's membership
[**orgCreate**](OrganizationApi.md#orgCreate) | **POST** orgs | Create an organization
[**orgCreateHook**](OrganizationApi.md#orgCreateHook) | **POST** orgs/{org}/hooks/ | Create a hook
[**orgCreateHook**](OrganizationApi.md#orgCreateHook) | **POST** orgs/{org}/hooks | Create a hook
[**orgCreateLabel**](OrganizationApi.md#orgCreateLabel) | **POST** orgs/{org}/labels | Create a label for an organization
[**orgCreateTeam**](OrganizationApi.md#orgCreateTeam) | **POST** orgs/{org}/teams | Create a team
[**orgDelete**](OrganizationApi.md#orgDelete) | **DELETE** orgs/{org} | Delete an organization
+2
View File
@@ -6,12 +6,14 @@ Name | Type | Description | Notes
**allowMergeCommits** | **Boolean** | | [optional]
**allowRebase** | **Boolean** | | [optional]
**allowRebaseExplicit** | **Boolean** | | [optional]
**allowRebaseUpdate** | **Boolean** | | [optional]
**allowSquashMerge** | **Boolean** | | [optional]
**archived** | **Boolean** | | [optional]
**avatarUrl** | **String** | | [optional]
**cloneUrl** | **String** | | [optional]
**createdAt** | [**Date**](Date.md) | | [optional]
**defaultBranch** | **String** | | [optional]
**defaultDeleteBranchAfterMerge** | **Boolean** | | [optional]
**defaultMergeStyle** | **String** | | [optional]
**description** | **String** | | [optional]
**empty** | **Boolean** | | [optional]
+1
View File
@@ -17,6 +17,7 @@ Name | Type | Description | Notes
**lastLogin** | [**Date**](Date.md) | | [optional]
**location** | **String** | the user's location | [optional]
**login** | **String** | the user's username | [optional]
**loginName** | **String** | the user's authentication sign-in name. | [optional]
**prohibitLogin** | **Boolean** | Is user login prohibited | [optional]
**restricted** | **Boolean** | Is user restricted | [optional]
**starredReposCount** | **Long** | | [optional]
@@ -101,7 +101,7 @@ public interface OrganizationApi {
* @return Call<Hook>
*/
@Headers({"Content-Type:application/json"})
@POST("orgs/{org}/hooks/")
@POST("orgs/{org}/hooks")
Call<Hook> orgCreateHook(
@retrofit2.http.Body CreateHookOption body, @retrofit2.http.Path("org") String org);
@@ -25,6 +25,9 @@ public class DismissPullReviewOptions implements Serializable {
@SerializedName("message")
private String message = null;
@SerializedName("priors")
private Boolean priors = null;
public DismissPullReviewOptions message(String message) {
this.message = message;
return this;
@@ -44,6 +47,25 @@ public class DismissPullReviewOptions implements Serializable {
this.message = message;
}
public DismissPullReviewOptions priors(Boolean priors) {
this.priors = priors;
return this;
}
/**
* Get priors
*
* @return priors
*/
@Schema(description = "")
public Boolean isPriors() {
return priors;
}
public void setPriors(Boolean priors) {
this.priors = priors;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
@@ -53,12 +75,13 @@ public class DismissPullReviewOptions implements Serializable {
return false;
}
DismissPullReviewOptions dismissPullReviewOptions = (DismissPullReviewOptions) o;
return Objects.equals(this.message, dismissPullReviewOptions.message);
return Objects.equals(this.message, dismissPullReviewOptions.message)
&& Objects.equals(this.priors, dismissPullReviewOptions.priors);
}
@Override
public int hashCode() {
return Objects.hash(message);
return Objects.hash(message, priors);
}
@Override
@@ -67,6 +90,7 @@ public class DismissPullReviewOptions implements Serializable {
sb.append("class DismissPullReviewOptions {\n");
sb.append(" message: ").append(toIndentedString(message)).append("\n");
sb.append(" priors: ").append(toIndentedString(priors)).append("\n");
sb.append("}");
return sb.toString();
}
@@ -32,6 +32,9 @@ public class Repository implements Serializable {
@SerializedName("allow_rebase_explicit")
private Boolean allowRebaseExplicit = null;
@SerializedName("allow_rebase_update")
private Boolean allowRebaseUpdate = null;
@SerializedName("allow_squash_merge")
private Boolean allowSquashMerge = null;
@@ -50,6 +53,9 @@ public class Repository implements Serializable {
@SerializedName("default_branch")
private String defaultBranch = null;
@SerializedName("default_delete_branch_after_merge")
private Boolean defaultDeleteBranchAfterMerge = null;
@SerializedName("default_merge_style")
private String defaultMergeStyle = null;
@@ -224,6 +230,25 @@ public class Repository implements Serializable {
this.allowRebaseExplicit = allowRebaseExplicit;
}
public Repository allowRebaseUpdate(Boolean allowRebaseUpdate) {
this.allowRebaseUpdate = allowRebaseUpdate;
return this;
}
/**
* Get allowRebaseUpdate
*
* @return allowRebaseUpdate
*/
@Schema(description = "")
public Boolean isAllowRebaseUpdate() {
return allowRebaseUpdate;
}
public void setAllowRebaseUpdate(Boolean allowRebaseUpdate) {
this.allowRebaseUpdate = allowRebaseUpdate;
}
public Repository allowSquashMerge(Boolean allowSquashMerge) {
this.allowSquashMerge = allowSquashMerge;
return this;
@@ -338,6 +363,25 @@ public class Repository implements Serializable {
this.defaultBranch = defaultBranch;
}
public Repository defaultDeleteBranchAfterMerge(Boolean defaultDeleteBranchAfterMerge) {
this.defaultDeleteBranchAfterMerge = defaultDeleteBranchAfterMerge;
return this;
}
/**
* Get defaultDeleteBranchAfterMerge
*
* @return defaultDeleteBranchAfterMerge
*/
@Schema(description = "")
public Boolean isDefaultDeleteBranchAfterMerge() {
return defaultDeleteBranchAfterMerge;
}
public void setDefaultDeleteBranchAfterMerge(Boolean defaultDeleteBranchAfterMerge) {
this.defaultDeleteBranchAfterMerge = defaultDeleteBranchAfterMerge;
}
public Repository defaultMergeStyle(String defaultMergeStyle) {
this.defaultMergeStyle = defaultMergeStyle;
return this;
@@ -1091,12 +1135,15 @@ public class Repository implements Serializable {
return Objects.equals(this.allowMergeCommits, repository.allowMergeCommits)
&& Objects.equals(this.allowRebase, repository.allowRebase)
&& Objects.equals(this.allowRebaseExplicit, repository.allowRebaseExplicit)
&& Objects.equals(this.allowRebaseUpdate, repository.allowRebaseUpdate)
&& Objects.equals(this.allowSquashMerge, repository.allowSquashMerge)
&& Objects.equals(this.archived, repository.archived)
&& Objects.equals(this.avatarUrl, repository.avatarUrl)
&& Objects.equals(this.cloneUrl, repository.cloneUrl)
&& Objects.equals(this.createdAt, repository.createdAt)
&& Objects.equals(this.defaultBranch, repository.defaultBranch)
&& Objects.equals(
this.defaultDeleteBranchAfterMerge, repository.defaultDeleteBranchAfterMerge)
&& Objects.equals(this.defaultMergeStyle, repository.defaultMergeStyle)
&& Objects.equals(this.description, repository.description)
&& Objects.equals(this.empty, repository.empty)
@@ -1144,12 +1191,14 @@ public class Repository implements Serializable {
allowMergeCommits,
allowRebase,
allowRebaseExplicit,
allowRebaseUpdate,
allowSquashMerge,
archived,
avatarUrl,
cloneUrl,
createdAt,
defaultBranch,
defaultDeleteBranchAfterMerge,
defaultMergeStyle,
description,
empty,
@@ -1201,12 +1250,16 @@ public class Repository implements Serializable {
sb.append(" allowRebaseExplicit: ")
.append(toIndentedString(allowRebaseExplicit))
.append("\n");
sb.append(" allowRebaseUpdate: ").append(toIndentedString(allowRebaseUpdate)).append("\n");
sb.append(" allowSquashMerge: ").append(toIndentedString(allowSquashMerge)).append("\n");
sb.append(" archived: ").append(toIndentedString(archived)).append("\n");
sb.append(" avatarUrl: ").append(toIndentedString(avatarUrl)).append("\n");
sb.append(" cloneUrl: ").append(toIndentedString(cloneUrl)).append("\n");
sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n");
sb.append(" defaultBranch: ").append(toIndentedString(defaultBranch)).append("\n");
sb.append(" defaultDeleteBranchAfterMerge: ")
.append(toIndentedString(defaultDeleteBranchAfterMerge))
.append("\n");
sb.append(" defaultMergeStyle: ").append(toIndentedString(defaultMergeStyle)).append("\n");
sb.append(" description: ").append(toIndentedString(description)).append("\n");
sb.append(" empty: ").append(toIndentedString(empty)).append("\n");
@@ -65,6 +65,9 @@ public class User implements Serializable {
@SerializedName("login")
private String login = null;
@SerializedName("login_name")
private String loginName = "empty";
@SerializedName("prohibit_login")
private Boolean prohibitLogin = null;
@@ -346,6 +349,25 @@ public class User implements Serializable {
this.login = login;
}
public User loginName(String loginName) {
this.loginName = loginName;
return this;
}
/**
* the user&#x27;s authentication sign-in name.
*
* @return loginName
*/
@Schema(description = "the user's authentication sign-in name.")
public String getLoginName() {
return loginName;
}
public void setLoginName(String loginName) {
this.loginName = loginName;
}
public User prohibitLogin(Boolean prohibitLogin) {
this.prohibitLogin = prohibitLogin;
return this;
@@ -464,6 +486,7 @@ public class User implements Serializable {
&& Objects.equals(this.lastLogin, user.lastLogin)
&& Objects.equals(this.location, user.location)
&& Objects.equals(this.login, user.login)
&& Objects.equals(this.loginName, user.loginName)
&& Objects.equals(this.prohibitLogin, user.prohibitLogin)
&& Objects.equals(this.restricted, user.restricted)
&& Objects.equals(this.starredReposCount, user.starredReposCount)
@@ -488,6 +511,7 @@ public class User implements Serializable {
lastLogin,
location,
login,
loginName,
prohibitLogin,
restricted,
starredReposCount,
@@ -514,6 +538,7 @@ public class User implements Serializable {
sb.append(" lastLogin: ").append(toIndentedString(lastLogin)).append("\n");
sb.append(" location: ").append(toIndentedString(location)).append("\n");
sb.append(" login: ").append(toIndentedString(login)).append("\n");
sb.append(" loginName: ").append(toIndentedString(loginName)).append("\n");
sb.append(" prohibitLogin: ").append(toIndentedString(prohibitLogin)).append("\n");
sb.append(" restricted: ").append(toIndentedString(restricted)).append("\n");
sb.append(" starredReposCount: ").append(toIndentedString(starredReposCount)).append("\n");