MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[github] Fix PR merge

Browse Source 
Bad API model parameter name
This commit is contained in:
Ivan Semenov
2019-02-05 16:26:48 +03:00
parent c8c8585990
commit 1a205f9f9c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/github/src/org/jetbrains/plugins/github/api/requests/GithubPullRequestMergeRebaseRequest.java
+2 -2
View File
@@ -7,10 +7,10 @@ import org.jetbrains.plugins.github.api.data.GithubPullRequestMergeMethod;
@SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"})
public class GithubPullRequestMergeRebaseRequest {
@NotNull private final String sha;
@NotNull private final GithubPullRequestMergeMethod method;
@NotNull private final GithubPullRequestMergeMethod mergeMethod;
public GithubPullRequestMergeRebaseRequest(@NotNull String sha) {
this.sha = sha;
this.method = GithubPullRequestMergeMethod.rebase;
this.mergeMethod = GithubPullRequestMergeMethod.rebase;
}
}
plugins/github/src/org/jetbrains/plugins/github/api/requests/GithubPullRequestMergeRequest.java
+4 -4
View File
@@ -9,19 +9,19 @@ public class GithubPullRequestMergeRequest {
@NotNull private final String commitTitle;
@NotNull private final String commitMessage;
@NotNull private final String sha;
@NotNull private final GithubPullRequestMergeMethod method;
@NotNull private final GithubPullRequestMergeMethod mergeMethod;
public GithubPullRequestMergeRequest(@NotNull String commitTitle,
@NotNull String commitMessage,
@NotNull String sha,
@NotNull GithubPullRequestMergeMethod method) {
if (method != GithubPullRequestMergeMethod.merge && method != GithubPullRequestMergeMethod.squash) {
@NotNull GithubPullRequestMergeMethod mergeMethod) {
if (mergeMethod != GithubPullRequestMergeMethod.merge && mergeMethod != GithubPullRequestMergeMethod.squash) {
throw new IllegalArgumentException("Invalid merge method");
}
this.commitTitle = commitTitle;
this.commitMessage = commitMessage;
this.sha = sha;
this.method = method;
this.mergeMethod = mergeMethod;
}
}