Merge branch 'main' into fix/JLL/project_card_repository

Author: bitwiseman

.github/workflows/maven-build.yml

@@ -13,14 +13,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 16 ]
+        java: [ 16, 17 ]
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'zulu'
       - name: Cached .m2
         uses: actions/[email protected]
         with:
@@ -39,14 +39,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu, windows ]
-        java: [ 8, 11, 16 ]
+        java: [ 8.0.192, 8, 11.0.3, 11, 16, 17 ]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
         java-version: ${{ matrix.java }}
-        distribution: 'adopt'
+        distribution: 'zulu'
     - uses: actions/[email protected]
       with:
         path: ~/.m2/repository
@@ -55,22 +55,22 @@ jobs:
           ${{ runner.os }}-maven-
     # JDK 8
     - name: Maven Install without Code Coverage
-      if: matrix.os == 'windows' && matrix.java == '8'
+      if: matrix.os == 'windows' && startsWith(matrix.java, '8')
       run: mvn -B clean install --file pom.xml
     - name: Maven Install with Code Coverage
-      if: matrix.os != 'windows' && matrix.java == '8'
+      if: matrix.os != 'windows' && startsWith(matrix.java, '8')
       run: mvn -B clean install -D enable-ci --file pom.xml
     - name: Codecov Report 
-      if: matrix.os != 'windows' && matrix.java == '8'
+      if: matrix.os != 'windows' && startsWith(matrix.java, '8')
       uses: codecov/[email protected]  
     # JDK 11+
     - name: Maven Install without Code Coverage
-      if: matrix.os == 'windows' && matrix.java != '8'
+      if: matrix.os == 'windows' && !startsWith(matrix.java, '8')
       env:
         MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
       run: mvn -B clean install --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
     - name: Maven Install with Code Coverage
-      if: matrix.os != 'windows' && matrix.java != '8'
+      if: matrix.os != 'windows' && !startsWith(matrix.java, '8')
       env:
         MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
       run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"

pom.xml

@@ -319,7 +319,7 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.15.0</version>
         <executions>
           <execution>
             <id>spotless-check</id>

src/main/java/org/kohsuke/github/GHPullRequest.java

@@ -68,8 +68,10 @@ public class GHPullRequest extends GHIssue implements Refreshable {
     private String mergeable_state;
     private int changed_files;
     private String merge_commit_sha;
+    private AutoMerge auto_merge;
 
     // pull request reviewers
+
     private GHUser[] requested_reviewers;
     private GHTeam[] requested_teams;
 
@@ -84,11 +86,19 @@ protected String getApiRoute() {
             // Issues returned from search to do not have an owner. Attempt to use url.
             final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!");
             return StringUtils.prependIfMissing(url.toString().replace(root().getApiUrl(), ""), "/");
-
         }
         return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/pulls/" + number;
     }
 
+    /**
+     * The status of auto merging a pull request.
+     *
+     * @return the {@linkplain AutoMerge} or {@code null} if no auto merge is set.
+     */
+    public AutoMerge getAutoMerge() {
+        return auto_merge;
+    }
+
     /**
      * The URL of the patch file. like https://github.com/jenkinsci/jenkins/pull/100.patch
      *
@@ -268,9 +278,7 @@ public Boolean getMergeable() throws IOException {
         return mergeable;
     }
 
-    /**
-     * for test purposes only
-     */
+    /** for test purposes only */
     @Deprecated
     Boolean getMergeableNoRefresh() throws IOException {
         return mergeable;
@@ -351,6 +359,7 @@ public List<GHTeam> getRequestedTeams() throws IOException {
     /**
      * Fully populate the data by retrieving missing data.
      *
+     * <p>
      * Depending on the original API call where this object is created, it may not contain everything.
      */
     private void populate() throws IOException {
@@ -359,9 +368,7 @@ private void populate() throws IOException {
         refresh();
     }
 
-    /**
-     * Repopulates this object.
-     */
+    /** Repopulates this object. */
     public void refresh() throws IOException {
         if (isOffline()) {
             return; // cannot populate, will have to live with what we have
@@ -378,7 +385,6 @@ public void refresh() throws IOException {
      * default.
      *
      * @return the paged iterable
-     *
      * @see <a href="https://docs.github.com/en/rest/reference/pulls#list-pull-requests-files">List pull requests
      *      files</a>
      */
@@ -577,6 +583,7 @@ public void updateBranch() throws IOException {
 
     /**
      * Merge this pull request.
+     *
      * <p>
      * The equivalent of the big green "Merge pull request" button.
      *
@@ -591,6 +598,7 @@ public void merge(String msg) throws IOException {
 
     /**
      * Merge this pull request.
+     *
      * <p>
      * The equivalent of the big green "Merge pull request" button.
      *
@@ -607,6 +615,7 @@ public void merge(String msg, String sha) throws IOException {
 
     /**
      * Merge this pull request, using the specified merge method.
+     *
      * <p>
      * The equivalent of the big green "Merge pull request" button.
      *
@@ -629,11 +638,58 @@ public void merge(String msg, String sha, MergeMethod method) throws IOException
                 .send();
     }
 
-    /**
-     * The enum MergeMethod.
-     */
+    /** The enum MergeMethod. */
     public enum MergeMethod {
         MERGE, SQUASH, REBASE
     }
 
+    /**
+     * The status of auto merging a {@linkplain GHPullRequest}.
+     *
+     */
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Field comes from JSON deserialization")
+    public static class AutoMerge {
+
+        private GHUser enabled_by;
+        private MergeMethod merge_method;
+        private String commit_title;
+        private String commit_message;
+
+        /**
+         * The user who enabled the auto merge of the pull request.
+         *
+         * @return the {@linkplain GHUser}
+         */
+        @SuppressFBWarnings(value = { "EI_EXPOSE_REP" }, justification = "Expected behavior")
+        public GHUser getEnabledBy() {
+            return enabled_by;
+        }
+
+        /**
+         * The merge method of the auto merge.
+         *
+         * @return the {@linkplain MergeMethod}
+         */
+        public MergeMethod getMergeMethod() {
+            return merge_method;
+        }
+
+        /**
+         * the title of the commit, if e.g. {@linkplain MergeMethod#SQUASH} is used for the auto merge.
+         *
+         * @return the title of the commit
+         */
+        public String getCommitTitle() {
+            return commit_title;
+        }
+
+        /**
+         * the message of the commit, if e.g. {@linkplain MergeMethod#SQUASH} is used for the auto merge.
+         *
+         * @return the message of the commit
+         */
+        public String getCommitMessage() {
+            return commit_message;
+        }
+    }
 }

src/main/java/org/kohsuke/github/GHRepository.java

@@ -57,6 +57,7 @@
 import java.util.WeakHashMap;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import static java.util.Arrays.asList;
 import static java.util.Objects.requireNonNull;
@@ -3211,6 +3212,26 @@ public <T> T readTar(InputStreamFunction<T> streamFunction, String ref) throws I
         return downloadArchive("tar", ref, streamFunction);
     }
 
+    /**
+     * Create a repository dispatch event, which can be used to start a workflow/action from outside github, as
+     * described on https://docs.github.com/en/rest/reference/repos#create-a-repository-dispatch-event
+     *
+     * @param eventType
+     *            the eventType
+     * @param clientPayload
+     *            a custom payload , can be nullable
+     * @throws IOException
+     *             the io exception
+     */
+    public <T> void dispatch(String eventType, @Nullable T clientPayload) throws IOException {
+        root().createRequest()
+                .method("POST")
+                .withUrlPath(getApiTailUrl("dispatches"))
+                .with("event_type", eventType)
+                .with("client_payload", clientPayload)
+                .send();
+    }
+
     private <T> T downloadArchive(@Nonnull String type,
             @CheckForNull String ref,
             @Nonnull InputStreamFunction<T> streamFunction) throws IOException {

src/test/java/org/kohsuke/github/EnumTest.java

@@ -1,6 +1,7 @@
 package org.kohsuke.github;
 
 import org.junit.Test;
+import org.kohsuke.github.GHPullRequest.MergeMethod;
 
 import static org.hamcrest.CoreMatchers.*;
 
@@ -55,7 +56,7 @@ public void touchEnums() {
         assertThat(GHProject.ProjectState.values().length, equalTo(2));
         assertThat(GHProject.ProjectStateFilter.values().length, equalTo(3));
 
-        assertThat(GHPullRequest.MergeMethod.values().length, equalTo(3));
+        assertThat(MergeMethod.values().length, equalTo(3));
 
         assertThat(GHPullRequestQueryBuilder.Sort.values().length, equalTo(4));
 

src/test/java/org/kohsuke/github/GHPullRequestTest.java

@@ -3,6 +3,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.kohsuke.github.GHPullRequest.AutoMerge;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -37,6 +38,14 @@ public void createPullRequest() throws Exception {
         assertThat(p.getTitle(), equalTo(name));
         assertThat(p.canMaintainerModify(), is(false));
         assertThat(p.isDraft(), is(false));
+
+        // Check auto merge status of the pull request
+        final AutoMerge autoMerge = p.getAutoMerge();
+        assertThat(autoMerge, is(notNullValue()));
+        assertThat(autoMerge.getCommitMessage(), equalTo("This is a auto merged squash commit message"));
+        assertThat(autoMerge.getCommitTitle(), equalTo("This is a auto merged squash commit"));
+        assertThat(autoMerge.getMergeMethod(), equalTo(GHPullRequest.MergeMethod.SQUASH));
+        assertThat(autoMerge.getEnabledBy(), is(notNullValue()));
     }
 
     @Test
@@ -60,7 +69,6 @@ public void createDraftPullRequest() throws Exception {
         p = repo.queryPullRequests().state(GHIssueState.OPEN).head("test/stable").list().toList().get(0);
         assertThat(p2.getNumber(), is(p.getNumber()));
         assertThat(p.isDraft(), is(true));
-
     }
 
     @Test

src/test/java/org/kohsuke/github/GHRepositoryTest.java

@@ -13,6 +13,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -987,4 +988,19 @@ public void getCommitsBetweenPaged() throws Exception {
         assertThat(mockGitHub.getRequestCount(), equalTo(startingCount + 4));
     }
 
+    @Test
+    public void createDispatchEventWithoutClientPayload() throws Exception {
+        GHRepository repository = getTempRepository();
+        repository.dispatch("test", null);
+    }
+
+    @Test
+    public void createDispatchEventWithClientPayload() throws Exception {
+        GHRepository repository = getTempRepository();
+        Map<String, Object> clientPayload = new HashMap<>();
+        clientPayload.put("name", "joe.doe");
+        clientPayload.put("list", new ArrayList<>());
+        repository.dispatch("test", clientPayload);
+    }
+
 }

src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_hub4j-test-org_github-api_pulls-4.json

@@ -328,6 +328,31 @@
   "mergeable": null,
   "rebaseable": null,
   "mergeable_state": "unknown",
+  "auto_merge": {
+    "enabled_by": {
+      "login": "bitwiseman",
+      "id": 1958953,
+      "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+      "gravatar_id": "",
+      "url": "http://localhost:51456/users/bitwiseman",
+      "html_url": "https://github.com/bitwiseman",
+      "followers_url": "http://localhost:51456/users/bitwiseman/followers",
+      "following_url": "http://localhost:51456/users/bitwiseman/following{/other_user}",
+      "gists_url": "http://localhost:51456/users/bitwiseman/gists{/gist_id}",
+      "starred_url": "http://localhost:51456/users/bitwiseman/starred{/owner}{/repo}",
+      "subscriptions_url": "http://localhost:51456/users/bitwiseman/subscriptions",
+      "organizations_url": "http://localhost:51456/users/bitwiseman/orgs",
+      "repos_url": "http://localhost:51456/users/bitwiseman/repos",
+      "events_url": "http://localhost:51456/users/bitwiseman/events{/privacy}",
+      "received_events_url": "http://localhost:51456/users/bitwiseman/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "merge_method": "squash",
+    "commit_title": "This is a auto merged squash commit",
+    "commit_message": "This is a auto merged squash commit message"
+  },
   "merged_by": null,
   "comments": 0,
   "review_comments": 0,
@@ -336,4 +361,4 @@
   "additions": 1,
   "deletions": 1,
   "changed_files": 1
-}
+}