From 2d832e232d99621fa4ef808edd769042c7e26200 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sat, 20 Oct 2018 13:57:43 +0100 Subject: [PATCH] More fixes of the gitea swagger api See https://github.com/go-gitea/gitea/pull/4845 --- docs/AdminApi.md | 22 +- docs/IssueApi.md | 92 +++---- docs/OrganizationApi.md | 56 ++-- docs/RepositoryApi.md | 106 ++++---- docs/UserApi.md | 24 +- src/main/java/io/gitea/ApiException.java | 2 +- src/main/java/io/gitea/Configuration.java | 2 +- src/main/java/io/gitea/Pair.java | 2 +- src/main/java/io/gitea/StringUtil.java | 2 +- src/main/java/io/gitea/api/AdminApi.java | 95 ++++--- src/main/java/io/gitea/api/IssueApi.java | 220 ++++++++-------- .../java/io/gitea/api/OrganizationApi.java | 155 ++++++----- src/main/java/io/gitea/api/RepositoryApi.java | 248 ++++++++++-------- src/main/java/io/gitea/api/UserApi.java | 60 ++--- src/main/java/io/gitea/auth/ApiKeyAuth.java | 2 +- src/main/java/io/gitea/auth/OAuth.java | 2 +- src/main/java/io/gitea/model/AccessToken.java | 2 +- .../java/io/gitea/model/AccessTokenName.java | 2 +- .../io/gitea/model/AddCollaboratorOption.java | 2 +- .../java/io/gitea/model/AddTimeOption.java | 2 +- src/main/java/io/gitea/model/Attachment.java | 2 +- src/main/java/io/gitea/model/Branch.java | 2 +- src/main/java/io/gitea/model/Comment.java | 2 +- .../io/gitea/model/CreateEmailOption.java | 2 +- .../java/io/gitea/model/CreateForkOption.java | 2 +- .../io/gitea/model/CreateGPGKeyOption.java | 2 +- .../java/io/gitea/model/CreateHookOption.java | 2 +- .../gitea/model/CreateIssueCommentOption.java | 2 +- .../io/gitea/model/CreateIssueOption.java | 2 +- .../java/io/gitea/model/CreateKeyOption.java | 2 +- .../io/gitea/model/CreateLabelOption.java | 2 +- .../io/gitea/model/CreateMilestoneOption.java | 2 +- .../java/io/gitea/model/CreateOrgOption.java | 2 +- .../gitea/model/CreatePullRequestOption.java | 2 +- .../io/gitea/model/CreateReleaseOption.java | 2 +- .../java/io/gitea/model/CreateRepoOption.java | 2 +- .../io/gitea/model/CreateStatusOption.java | 2 +- .../java/io/gitea/model/CreateTeamOption.java | 2 +- .../java/io/gitea/model/CreateUserOption.java | 2 +- .../io/gitea/model/DeleteEmailOption.java | 2 +- src/main/java/io/gitea/model/DeployKey.java | 2 +- .../io/gitea/model/EditAttachmentOptions.java | 2 +- .../io/gitea/model/EditDeadlineOption.java | 2 +- .../java/io/gitea/model/EditHookOption.java | 2 +- .../gitea/model/EditIssueCommentOption.java | 2 +- .../java/io/gitea/model/EditIssueOption.java | 2 +- .../java/io/gitea/model/EditLabelOption.java | 2 +- .../io/gitea/model/EditMilestoneOption.java | 2 +- .../java/io/gitea/model/EditOrgOption.java | 2 +- .../io/gitea/model/EditPullRequestOption.java | 2 +- .../io/gitea/model/EditReleaseOption.java | 2 +- .../java/io/gitea/model/EditTeamOption.java | 2 +- .../java/io/gitea/model/EditUserOption.java | 2 +- src/main/java/io/gitea/model/Email.java | 2 +- src/main/java/io/gitea/model/GPGKey.java | 2 +- src/main/java/io/gitea/model/GPGKeyEmail.java | 2 +- src/main/java/io/gitea/model/Issue.java | 2 +- .../java/io/gitea/model/IssueDeadline.java | 2 +- .../io/gitea/model/IssueLabelsOption.java | 2 +- src/main/java/io/gitea/model/Label.java | 2 +- .../java/io/gitea/model/MarkdownOption.java | 2 +- .../java/io/gitea/model/MigrateRepoForm.java | 2 +- src/main/java/io/gitea/model/Milestone.java | 2 +- .../java/io/gitea/model/Organization.java | 2 +- .../java/io/gitea/model/PRBranchInfo.java | 2 +- .../java/io/gitea/model/PayloadCommit.java | 2 +- .../model/PayloadCommitVerification.java | 2 +- src/main/java/io/gitea/model/PayloadUser.java | 2 +- src/main/java/io/gitea/model/Permission.java | 2 +- src/main/java/io/gitea/model/PublicKey.java | 2 +- src/main/java/io/gitea/model/PullRequest.java | 2 +- .../java/io/gitea/model/PullRequestMeta.java | 2 +- src/main/java/io/gitea/model/Release.java | 2 +- src/main/java/io/gitea/model/Repository.java | 2 +- .../java/io/gitea/model/SearchResults.java | 2 +- .../java/io/gitea/model/ServerVersion.java | 2 +- src/main/java/io/gitea/model/Status.java | 2 +- src/main/java/io/gitea/model/Team.java | 2 +- src/main/java/io/gitea/model/TrackedTime.java | 2 +- src/main/java/io/gitea/model/User.java | 2 +- .../java/io/gitea/model/UserSearchList.java | 2 +- src/main/java/io/gitea/model/WatchInfo.java | 2 +- src/test/java/io/gitea/api/AdminApiTest.java | 14 +- src/test/java/io/gitea/api/IssueApiTest.java | 46 ++-- .../io/gitea/api/OrganizationApiTest.java | 30 ++- .../java/io/gitea/api/RepositoryApiTest.java | 53 ++-- src/test/java/io/gitea/api/UserApiTest.java | 12 +- swagger.v1.json | 151 +++++++++++ 88 files changed, 892 insertions(+), 636 deletions(-) diff --git a/docs/AdminApi.md b/docs/AdminApi.md index a2a2b89..8c58f9c 100644 --- a/docs/AdminApi.md +++ b/docs/AdminApi.md @@ -15,7 +15,7 @@ Method | HTTP request | Description # **adminCreateOrg** -> Organization adminCreateOrg(username) +> Organization adminCreateOrg(username, organization) Create an organization @@ -67,8 +67,9 @@ Token.setApiKey("YOUR API KEY"); AdminApi apiInstance = new AdminApi(); String username = "username_example"; // String | username of the user that will own the created organization +CreateOrgOption organization = new CreateOrgOption(); // CreateOrgOption | try { - Organization result = apiInstance.adminCreateOrg(username); + Organization result = apiInstance.adminCreateOrg(username, organization); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling AdminApi#adminCreateOrg"); @@ -81,6 +82,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **username** | **String**| username of the user that will own the created organization | + **organization** | [**CreateOrgOption**](CreateOrgOption.md)| | ### Return type @@ -97,7 +99,7 @@ Name | Type | Description | Notes # **adminCreatePublicKey** -> PublicKey adminCreatePublicKey(username) +> PublicKey adminCreatePublicKey(username, key) Add a public key on behalf of a user @@ -149,8 +151,9 @@ Token.setApiKey("YOUR API KEY"); AdminApi apiInstance = new AdminApi(); String username = "username_example"; // String | username of the user +CreateKeyOption key = new CreateKeyOption(); // CreateKeyOption | try { - PublicKey result = apiInstance.adminCreatePublicKey(username); + PublicKey result = apiInstance.adminCreatePublicKey(username, key); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling AdminApi#adminCreatePublicKey"); @@ -163,6 +166,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **username** | **String**| username of the user | + **key** | [**CreateKeyOption**](CreateKeyOption.md)| | [optional] ### Return type @@ -179,7 +183,7 @@ Name | Type | Description | Notes # **adminCreateRepo** -> Repository adminCreateRepo(username) +> Repository adminCreateRepo(username, repository) Create a repository on behalf a user @@ -231,8 +235,9 @@ Token.setApiKey("YOUR API KEY"); AdminApi apiInstance = new AdminApi(); String username = "username_example"; // String | username of the user. This user will own the created repository +CreateRepoOption repository = new CreateRepoOption(); // CreateRepoOption | try { - Repository result = apiInstance.adminCreateRepo(username); + Repository result = apiInstance.adminCreateRepo(username, repository); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling AdminApi#adminCreateRepo"); @@ -245,6 +250,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **username** | **String**| username of the user. This user will own the created repository | + **repository** | [**CreateRepoOption**](CreateRepoOption.md)| | ### Return type @@ -476,7 +482,7 @@ Token.setApiKey("YOUR API KEY"); AdminApi apiInstance = new AdminApi(); String username = "username_example"; // String | username of user -Integer id = 56; // Integer | id of the key to delete +Long id = 789L; // Long | id of the key to delete try { apiInstance.adminDeleteUserPublicKey(username, id); } catch (ApiException e) { @@ -490,7 +496,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **username** | **String**| username of user | - **id** | **Integer**| id of the key to delete | + **id** | **Long**| id of the key to delete | ### Return type diff --git a/docs/IssueApi.md b/docs/IssueApi.md index f6dfe1b..1e1f1ef 100644 --- a/docs/IssueApi.md +++ b/docs/IssueApi.md @@ -90,7 +90,7 @@ Token.setApiKey("YOUR API KEY"); IssueApi apiInstance = new IssueApi(); String owner = "owner_example"; // String | owner of the repo String repo = "repo_example"; // String | name of the repo -Integer index = 56; // Integer | index of the issue +Long index = 789L; // Long | index of the issue IssueLabelsOption body = new IssueLabelsOption(); // IssueLabelsOption | try { List