fix: some post-review changes and test additions

Author: tginiotis-at-work

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

@@ -225,11 +225,8 @@ public boolean isEnabled() {
      * The type Check.
      */
     public static class Check {
-        @JsonProperty
         private String context;
-
-        @JsonProperty
-        private Integer app_id;
+        private Integer appId;
 
         /**
          * no-arg constructor for the serializer
@@ -247,7 +244,7 @@ public Check() {
          */
         public Check(String context, Integer appId) {
             this.context = context;
-            this.app_id = appId;
+            this.appId = appId;
         }
 
         /**
@@ -265,7 +262,7 @@ public String getContext() {
          * @return the integer
          */
         public Integer getAppId() {
-            return app_id;
+            return appId;
         }
     }
 

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

@@ -13,6 +13,8 @@
 import org.kohsuke.github.GHBranchProtection.RequiredReviews;
 import org.kohsuke.github.GHBranchProtection.RequiredStatusChecks;
 
+import java.util.ArrayList;
+
 import static org.hamcrest.Matchers.*;
 
 // TODO: Auto-generated Javadoc
@@ -198,10 +200,18 @@ public void testSignedCommits() throws Exception {
     @Test
     public void testChecksWithAppIds() throws Exception {
         GHBranchProtection protection = branch.enableProtection()
-                .addRequiredChecksWithAppIds(new GHBranchProtection.Check("context", -1))
+                .addRequiredChecksWithAppIds(new GHBranchProtection.Check("context", -1),
+                        new GHBranchProtection.Check("context2", 123))
                 .enable();
 
-        assertThat(protection.getRequiredStatusChecks().getChecks().isEmpty(), is(false));
+        ArrayList<GHBranchProtection.Check> resultChecks = new ArrayList<>(
+                protection.getRequiredStatusChecks().getChecks());
+
+        assertThat(resultChecks.size(), is(2));
+        assertThat(resultChecks.get(0).getContext(), is("context"));
+        assertThat(resultChecks.get(0).getAppId(), nullValue());
+        assertThat(resultChecks.get(1).getContext(), is("context2"));
+        assertThat(resultChecks.get(1).getAppId(), is(123));
     }
 
     /**

src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testChecksWithAppIds/__files/5-r_h_t_branches_main_protection.json

@@ -0,0 +1,51 @@
+{
+  "url": "https://api.github.com/repos/hub4j-test-org/temp-testChecksWithAppIds/branches/main/protection",
+  "required_status_checks": {
+    "url": "https://api.github.com/repos/hub4j-test-org/temp-testChecksWithAppIds/branches/main/protection/required_status_checks",
+    "strict": false,
+    "contexts": [
+      "context",
+      "context2"
+    ],
+    "contexts_url": "https://api.github.com/repos/hub4j-test-org/temp-testChecksWithAppIds/branches/main/protection/required_status_checks/contexts",
+    "checks": [
+      {
+        "context": "context",
+        "app_id": null
+      },
+      {
+        "context": "context2",
+        "app_id": 123
+      }
+    ]
+  },
+  "required_signatures": {
+    "url": "https://api.github.com/repos/hub4j-test-org/temp-testChecksWithAppIds/branches/main/protection/required_signatures",
+    "enabled": false
+  },
+  "enforce_admins": {
+    "url": "https://api.github.com/repos/hub4j-test-org/temp-testChecksWithAppIds/branches/main/protection/enforce_admins",
+    "enabled": false
+  },
+  "required_linear_history": {
+    "enabled": false
+  },
+  "allow_force_pushes": {
+    "enabled": false
+  },
+  "allow_deletions": {
+    "enabled": false
+  },
+  "block_creations": {
+    "enabled": false
+  },
+  "required_conversation_resolution": {
+    "enabled": false
+  },
+  "lock_branch": {
+    "enabled": false
+  },
+  "allow_fork_syncing": {
+    "enabled": false
+  }
+}

src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testChecksWithAppIds/mappings/5-r_h_t_branches_main_protection.json

@@ -0,0 +1,57 @@
+{
+  "id": "630402b5-486c-41df-83e7-f9f1a715ea08",
+  "name": "repos_hub4j-test-org_temp-testcheckswithappids_branches_main_protection",
+  "request": {
+    "url": "/repos/hub4j-test-org/temp-testChecksWithAppIds/branches/main/protection",
+    "method": "PUT",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.luke-cage-preview+json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"required_pull_request_reviews\":null,\"required_status_checks\":{\"strict\":false,\"checks\":[{\"context\":\"context\",\"app_id\":-1},{\"context\":\"context2\",\"app_id\":123}]},\"restrictions\":null,\"enforce_admins\":false}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "5-r_h_t_branches_main_protection.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Thu, 06 Jun 2024 08:33:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"eae3686ecc99456a89d4b1209c91dc3fefb1139da4cf8a9afbbd5c46ca4bb44c\"",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, admin:ssh_signing_key, audit_log, codespace, copilot, delete:packages, delete_repo, gist, notifications, project, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "github-authentication-token-expiration": "2024-06-16 12:56:36 UTC",
+      "X-GitHub-Media-Type": "github.v3; param=luke-cage-preview; format=json",
+      "x-github-api-version-selected": "2022-11-28",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4995",
+      "X-RateLimit-Reset": "1717666423",
+      "X-RateLimit-Used": "5",
+      "X-RateLimit-Resource": "core",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO, X-GitHub-Request-Id, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "0",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "B950:2575A0:9D3C7A6:9E339B3:6661746C"
+    }
+  },
+  "uuid": "630402b5-486c-41df-83e7-f9f1a715ea08",
+  "persistent": true,
+  "insertionIndex": 5
+}