diff --git a/pom.xml b/pom.xml index daf7b8fd..7c790141 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 github-client - 0.4.1 + 0.4.2 com.spotify @@ -23,7 +23,7 @@ scm:git:https://github.com/spotify/github-java-client.git scm:git:git@github.com:spotify/github-java-client.git scm:https://github.com/spotify/github-java-client/ - v0.4.1 + v0.4.2 @@ -67,7 +67,7 @@ UTF-8 UTF-8 - 1742308459 + 1743926423 spotbugsexclude.xml error checkstyle.xml @@ -189,7 +189,7 @@ commons-io commons-io - 2.7 + 2.14.0 compile diff --git a/src/main/java/com/spotify/github/v3/prs/AutoMerge.java b/src/main/java/com/spotify/github/v3/prs/AutoMerge.java new file mode 100644 index 00000000..6cbad38e --- /dev/null +++ b/src/main/java/com/spotify/github/v3/prs/AutoMerge.java @@ -0,0 +1,49 @@ +/*- + * -\-\- + * github-api + * -- + * Copyright (C) 2016 - 2020 Spotify AB + * -- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * -/-/- + */ + +package com.spotify.github.v3.prs; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.spotify.github.GithubStyle; +import com.spotify.github.v3.User; +import org.immutables.value.Value; + +import javax.annotation.Nullable; + +@Value.Immutable +@GithubStyle +@JsonSerialize(as = ImmutableAutoMerge.class) +@JsonDeserialize(as = ImmutableAutoMerge.class) +public interface AutoMerge { + // Who enabled the auto merge + User enabledBy(); + + // Merge Method chosen for the auto merge + String mergeMethod(); + + // The commit title to use when merging the pull request + @Nullable + String commitTitle(); + + // The commit message to use when merging the pull request + @Nullable + String commitMessage(); +} diff --git a/src/main/java/com/spotify/github/v3/prs/PullRequest.java b/src/main/java/com/spotify/github/v3/prs/PullRequest.java index 0938d0f2..84b88504 100644 --- a/src/main/java/com/spotify/github/v3/prs/PullRequest.java +++ b/src/main/java/com/spotify/github/v3/prs/PullRequest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -87,4 +87,7 @@ public interface PullRequest extends PullRequestItem { @Nullable List