From e33974d4217cc6414fc0744e7add730f2503cc0e Mon Sep 17 00:00:00 2001 From: Niko Dziemba Date: Mon, 2 May 2022 22:12:01 +0200 Subject: [PATCH] Add merge strategy fields to Repository model Adds: - allowMergeCommit - allowRebaseMerge - allowSquashMerge --- .../com/spotify/github/v3/repos/RepositoryBase.java | 12 ++++++++++++ .../com/spotify/github/v3/repos/RepositoryTest.java | 3 +++ .../com/spotify/github/v3/repos/repository.json | 3 +++ 3 files changed, 18 insertions(+) diff --git a/src/main/java/com/spotify/github/v3/repos/RepositoryBase.java b/src/main/java/com/spotify/github/v3/repos/RepositoryBase.java index 900af1bf..f8431f75 100644 --- a/src/main/java/com/spotify/github/v3/repos/RepositoryBase.java +++ b/src/main/java/com/spotify/github/v3/repos/RepositoryBase.java @@ -79,6 +79,18 @@ public interface RepositoryBase extends UpdateTracking { @Nullable URI htmlUrl(); + /** Allow squash merges */ + @Nullable + Boolean allowSquashMerge(); + + /** Allow merge commits */ + @Nullable + Boolean allowMergeCommit(); + + /** Allow rebase merges */ + @Nullable + Boolean allowRebaseMerge(); + /** Archive URL template */ @Nullable String archiveUrl(); diff --git a/src/test/java/com/spotify/github/v3/repos/RepositoryTest.java b/src/test/java/com/spotify/github/v3/repos/RepositoryTest.java index a5cfad5b..f3570d3b 100644 --- a/src/test/java/com/spotify/github/v3/repos/RepositoryTest.java +++ b/src/test/java/com/spotify/github/v3/repos/RepositoryTest.java @@ -50,5 +50,8 @@ public void testDeserialization() throws IOException { assertThat(repository.fullName(), is(repository.owner().login() + "/Hello-World")); assertThat(repository.isPrivate(), is(false)); assertThat(repository.isArchived(), is(false)); + assertThat(repository.allowMergeCommit(), is(false)); + assertThat(repository.allowRebaseMerge(), is(true)); + assertThat(repository.allowSquashMerge(), is(true)); } } diff --git a/src/test/resources/com/spotify/github/v3/repos/repository.json b/src/test/resources/com/spotify/github/v3/repos/repository.json index 3f6fa8a2..fdc68ba0 100644 --- a/src/test/resources/com/spotify/github/v3/repos/repository.json +++ b/src/test/resources/com/spotify/github/v3/repos/repository.json @@ -81,6 +81,9 @@ "forks": 2, "has_pages": false, "has_downloads": true, + "allow_squash_merge": true, + "allow_merge_commit": false, + "allow_rebase_merge": true, "pushed_at": "2011-01-26T19:06:43Z", "created_at": "2011-01-26T19:01:12Z", "updated_at": "2011-01-26T19:14:43Z",