diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/requests/GithubPullRequestMergeRebaseRequest.java b/plugins/github/src/org/jetbrains/plugins/github/api/requests/GithubPullRequestMergeRebaseRequest.java index bc3623bcc609..9fe842bd17c2 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/requests/GithubPullRequestMergeRebaseRequest.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/requests/GithubPullRequestMergeRebaseRequest.java @@ -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; } } diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/requests/GithubPullRequestMergeRequest.java b/plugins/github/src/org/jetbrains/plugins/github/api/requests/GithubPullRequestMergeRequest.java index 831fd13112e5..c80109d33d7d 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/requests/GithubPullRequestMergeRequest.java +++ b/plugins/github/src/org/jetbrains/plugins/github/api/requests/GithubPullRequestMergeRequest.java @@ -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; } }