Repository: hub4j/github-api
Pull request #1635 (2023-03-27 17:33:04)

Clarify documentation
This pull request clarifies Javadoc for a method.



Patch:
diff --git a/pom.xml b/pom.xml
index 5086a52be..82508d18b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -396,7 +396,7 @@
       <plugin>
         <groupId>com.github.siom79.japicmp</groupId>
         <artifactId>japicmp-maven-plugin</artifactId>
-        <version>0.17.1</version>
+        <version>0.16.0</version>
         <configuration>
           <parameter>
             <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
diff --git a/src/main/java/org/kohsuke/github/GHMarketplacePriceModel.java b/src/main/java/org/kohsuke/github/GHMarketplacePriceModel.java
index a41cfc651..f8a0c5104 100644
--- a/src/main/java/org/kohsuke/github/GHMarketplacePriceModel.java
+++ b/src/main/java/org/kohsuke/github/GHMarketplacePriceModel.java
@@ -12,11 +12,11 @@ import com.fasterxml.jackson.annotation.JsonValue;
 public enum GHMarketplacePriceModel {
 
     /** The free. */
-    FREE("FREE"),
+    FREE("free"),
     /** The per unit. */
-    PER_UNIT("PER_UNIT"),
+    PER_UNIT("per-unit"),
     /** The flat rate. */
-    FLAT_RATE("FLAT_RATE");
+    FLAT_RATE("flat-rate");
 
     @JsonValue
     private final String internalName;
diff --git a/src/main/java/org/kohsuke/github/GHPullRequest.java b/src/main/java/org/kohsuke/github/GHPullRequest.java
index 894c14649..44de034ca 100644
--- a/src/main/java/org/kohsuke/github/GHPullRequest.java
+++ b/src/main/java/org/kohsuke/github/GHPullRequest.java
@@ -242,9 +242,9 @@ public class GHPullRequest extends GHIssue implements Refreshable {
     }
 
     /**
-     * Gets commits.
+     * Gets the number of commits.
      *
-     * @return the commits
+     * @return the number of commits
      * @throws IOException
      *             the io exception
      */
diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java
index e09be03ab..5220a1b80 100644
--- a/src/main/java/org/kohsuke/github/GHRepository.java
+++ b/src/main/java/org/kohsuke/github/GHRepository.java
@@ -2850,31 +2850,14 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public GHDeployKey addDeployKey(String title, String key) throws IOException {
-        return addDeployKey(title, key, false);
-    }
-
-    /**
-     * Add deploy key gh deploy key.
-     *
-     * @param title
-     *            the title
-     * @param key
-     *            the key
-     * @param readOnly
-     *            read-only ability of the key
-     * @return the gh deploy key
-     * @throws IOException
-     *             the io exception
-     */
-    public GHDeployKey addDeployKey(String title, String key, boolean readOnly) throws IOException {
         return root().createRequest()
                 .method("POST")
                 .with("title", title)
                 .with("key", key)
-                .with("read_only", readOnly)
                 .withUrlPath(getApiTailUrl("keys"))
                 .fetch(GHDeployKey.class)
                 .lateBind(this);
+
     }
 
     /**


Test patch:
diff --git a/src/test/java/org/kohsuke/github/AppTest.java b/src/test/java/org/kohsuke/github/AppTest.java
index aef04e8cf..f8d7a3989 100755
--- a/src/test/java/org/kohsuke/github/AppTest.java
+++ b/src/test/java/org/kohsuke/github/AppTest.java
@@ -1283,43 +1283,18 @@ public class AppTest extends AbstractGitHubWireMockTest {
      * @throws IOException
      *             Signals that an I/O exception has occurred.
      */
+    @Ignore("Needs mocking check")
     @Test
     public void testAddDeployKey() throws IOException {
         GHRepository myRepository = getTestRepository();
         final GHDeployKey newDeployKey = myRepository.addDeployKey("test",
-                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATWwMLytklB44O66isWRKOB3Qd7Ysc7q7EyWTmT0bG9 test@example.com");
-        try {
-            assertThat(newDeployKey.getId(), notNullValue());
-
-            GHDeployKey k = Iterables.find(myRepository.getDeployKeys(), new Predicate<GHDeployKey>() {
-                public boolean apply(GHDeployKey deployKey) {
-                    return newDeployKey.getId() == deployKey.getId() && !deployKey.isRead_only();
-                }
-            });
-            assertThat(k, notNullValue());
-        } finally {
-            newDeployKey.delete();
-        }
-    }
-
-    /**
-     * Test add deploy key read-only.
-     *
-     * @throws IOException
-     *             Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testAddDeployKeyAsReadOnly() throws IOException {
-        GHRepository myRepository = getTestRepository();
-        final GHDeployKey newDeployKey = myRepository.addDeployKey("test",
-                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATWwMLytklB44O66isWRKOB3Qd7Ysc7q7EyWTmT0bG9 test@example.com",
-                true);
+                "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUt0RAycC5cS42JKh6SecfFZBR1RrF+2hYMctz4mk74/arBE+wFb7fnSHGzdGKX2h5CFOWODifRCJVhB7hlVxodxe+QkQQYAEL/x1WVCJnGgTGQGOrhOMj95V3UE5pQKhsKD608C+u5tSofcWXLToP1/wZ7U4/AHjqYi08OLsWToHCax55TZkvdt2jo0hbIoYU+XI9Q8Uv4ONDN1oabiOdgeKi8+crvHAuvNleiBhWVBzFh8KdfzaH5uNdw7ihhFjEd1vzqACsjCINCjdMfzl6jD9ExuWuE92nZJnucls2cEoNC6k2aPmrZDg9hA32FXVpyseY+bDUWFU6LO2LG6PB kohsuke@atlas");
         try {
             assertThat(newDeployKey.getId(), notNullValue());
 
             GHDeployKey k = Iterables.find(myRepository.getDeployKeys(), new Predicate<GHDeployKey>() {
                 public boolean apply(GHDeployKey deployKey) {
-                    return newDeployKey.getId() == deployKey.getId() && deployKey.isRead_only();
+                    return newDeployKey.getId() == deployKey.getId();
                 }
             });
             assertThat(k, notNullValue());
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/repos_hub4j-test-org_github-api-test-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/repos_hub4j-test-org_github-api-test-2.json
deleted file mode 100644
index 2d5a6b55f..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/repos_hub4j-test-org_github-api-test-2.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  "id": 611473997,
-  "node_id": "R_kgDOJHJaTQ",
-  "name": "github-api-test",
-  "full_name": "hub4j-test-org/github-api-test",
-  "private": false,
-  "owner": {
-    "login": "hub4j-test-org",
-    "id": 238558,
-    "node_id": "MDQ6VXNlcjIzODU1OA==",
-    "avatar_url": "https://avatars.githubusercontent.com/u/238558?v=4",
-    "gravatar_id": "",
-    "url": "https://api.github.com/users/hub4j-test-org",
-    "html_url": "https://github.com/hub4j-test-org",
-    "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
-    "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
-    "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
-    "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
-    "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
-    "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
-    "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
-    "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
-    "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
-    "type": "User",
-    "site_admin": false
-  },
-  "html_url": "https://github.com/hub4j-test-org/github-api-test",
-  "description": "A test repository for testing the github-api project: github-api-test",
-  "fork": false,
-  "url": "https://api.github.com/repos/hub4j-test-org/github-api-test",
-  "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/forks",
-  "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/keys{/key_id}",
-  "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/collaborators{/collaborator}",
-  "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/teams",
-  "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/hooks",
-  "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/issues/events{/number}",
-  "events_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/events",
-  "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/assignees{/user}",
-  "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/branches{/branch}",
-  "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/tags",
-  "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/git/blobs{/sha}",
-  "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/git/tags{/sha}",
-  "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/git/refs{/sha}",
-  "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/git/trees{/sha}",
-  "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/statuses/{sha}",
-  "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/languages",
-  "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/stargazers",
-  "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/contributors",
-  "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/subscribers",
-  "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/subscription",
-  "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/commits{/sha}",
-  "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/git/commits{/sha}",
-  "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/comments{/number}",
-  "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/issues/comments{/number}",
-  "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/contents/{+path}",
-  "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/compare/{base}...{head}",
-  "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/merges",
-  "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/{archive_format}{/ref}",
-  "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/downloads",
-  "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/issues{/number}",
-  "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/pulls{/number}",
-  "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/milestones{/number}",
-  "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/notifications{?since,all,participating}",
-  "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/labels{/name}",
-  "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/releases{/id}",
-  "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/deployments",
-  "created_at": "2023-03-08T22:36:45Z",
-  "updated_at": "2023-03-08T22:36:45Z",
-  "pushed_at": "2023-03-08T22:36:45Z",
-  "git_url": "git://github.com/hub4j-test-org/github-api-test.git",
-  "ssh_url": "git@github.com:hub4j-test-org/github-api-test.git",
-  "clone_url": "https://github.com/hub4j-test-org/github-api-test.git",
-  "svn_url": "https://github.com/hub4j-test-org/github-api-test",
-  "homepage": "http://github-api.kohsuke.org/",
-  "size": 0,
-  "stargazers_count": 0,
-  "watchers_count": 0,
-  "language": null,
-  "has_issues": true,
-  "has_projects": true,
-  "has_downloads": true,
-  "has_wiki": true,
-  "has_pages": false,
-  "has_discussions": false,
-  "forks_count": 0,
-  "mirror_url": null,
-  "archived": false,
-  "disabled": false,
-  "open_issues_count": 0,
-  "license": null,
-  "allow_forking": true,
-  "is_template": false,
-  "web_commit_signoff_required": false,
-  "topics": [],
-  "visibility": "public",
-  "forks": 0,
-  "open_issues": 0,
-  "watchers": 0,
-  "default_branch": "main",
-  "permissions": {
-    "admin": true,
-    "maintain": true,
-    "push": true,
-    "triage": true,
-    "pull": true
-  },
-  "security_and_analysis": {
-    "secret_scanning": {
-      "status": "disabled"
-    },
-    "secret_scanning_push_protection": {
-      "status": "disabled"
-    }
-  },
-  "network_count": 0,
-  "subscribers_count": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/repos_hub4j-test-org_github-api-test_keys-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/repos_hub4j-test-org_github-api-test_keys-3.json
deleted file mode 100644
index 8433b3212..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/repos_hub4j-test-org_github-api-test_keys-3.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "id": 78869617,
-  "key": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATWwMLytklB44O66isWRKOB3Qd7Ysc7q7EyWTmT0bG9",
-  "url": "https://api.github.com/repos/hub4j-test-org/github-api-test/keys/78869617",
-  "title": "test",
-  "verified": true,
-  "created_at": "2023-03-08T22:36:50Z",
-  "read_only": false,
-  "last_used": null,
-  "added_by": "hub4j-test-org"
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/repos_hub4j-test-org_github-api-test_keys-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/repos_hub4j-test-org_github-api-test_keys-4.json
deleted file mode 100644
index 92a6bea57..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/repos_hub4j-test-org_github-api-test_keys-4.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  {
-    "id": 78869617,
-    "key": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATWwMLytklB44O66isWRKOB3Qd7Ysc7q7EyWTmT0bG9",
-    "url": "https://api.github.com/repos/hub4j-test-org/github-api-test/keys/78869617",
-    "title": "test",
-    "verified": true,
-    "created_at": "2023-03-08T22:36:50Z",
-    "read_only": false,
-    "last_used": null,
-    "added_by": "hub4j-test-org"
-  }
-]
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/user-1.json
deleted file mode 100644
index 92e9ace93..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/__files/user-1.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "login": "hub4j-test-org",
-  "id": 7544739,
-  "node_id": "MDQ6VXNlcjIzODU1OA==",
-  "avatar_url": "https://avatars.githubusercontent.com/u/7544739?v=4",
-  "gravatar_id": "",
-  "url": "https://api.github.com/users/hub4j-test-org",
-  "html_url": "https://github.com/hub4j-test-org",
-  "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
-  "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
-  "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
-  "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
-  "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
-  "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
-  "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
-  "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
-  "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
-  "type": "User",
-  "site_admin": false,
-  "name": "hub4j-test-org",
-  "company": null,
-  "blog": "",
-  "location": "",
-  "email": null,
-  "hireable": null,
-  "bio": "",
-  "twitter_username": null,
-  "public_repos": 13,
-  "public_gists": 4,
-  "followers": 6,
-  "following": 1,
-  "created_at": "2010-04-07T08:30:12Z",
-  "updated_at": "2022-11-28T20:54:46Z"
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test-2.json
deleted file mode 100644
index 8764b8abe..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test-2.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "8b7ef826-893b-4288-b625-4492949cd9b1",
-  "name": "repos_hub4j-test-org_github-api-test",
-  "request": {
-    "url": "/repos/hub4j-test-org/github-api-test",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_hub4j-test-org_github-api-test-2.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 08 Mar 2023 22:36:49 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/\"9a25876ca00d328a54c1400dffe501009cdcbc3410dd90140b0c33cc19608961\"",
-      "Last-Modified": "Wed, 08 Mar 2023 22:36:45 GMT",
-      "github-authentication-token-expiration": "2023-04-07 23:24:34 +0200",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "x-github-api-version-selected": "2022-11-28",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4903",
-      "X-RateLimit-Reset": "1678317208",
-      "X-RateLimit-Used": "97",
-      "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": "E5D8:ACE5:B4A8F2D:B741C36:64090E01"
-    }
-  },
-  "uuid": "8b7ef826-893b-4288-b625-4492949cd9b1",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test_keys-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test_keys-3.json
deleted file mode 100644
index b73aab599..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test_keys-3.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "id": "f648e6ad-c2ec-42b2-bc75-017ac64e67d9",
-  "name": "repos_hub4j-test-org_github-api-test_keys",
-  "request": {
-    "url": "/repos/hub4j-test-org/github-api-test/keys",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3+json"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"read_only\":false,\"title\":\"test\",\"key\":\"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATWwMLytklB44O66isWRKOB3Qd7Ysc7q7EyWTmT0bG9 test@example.com\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": false
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_hub4j-test-org_github-api-test_keys-3.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 08 Mar 2023 22:36:50 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": "\"0a4e82c98d34824d431a19b779f7fcc35e1a3c1142ff9c1a7132d8840630f8a6\"",
-      "github-authentication-token-expiration": "2023-04-07 23:24:34 +0200",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "x-github-api-version-selected": "2022-11-28",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4902",
-      "X-RateLimit-Reset": "1678317208",
-      "X-RateLimit-Used": "98",
-      "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": "E5DE:A9BF:A40D94B:A69E360:64090E01",
-      "Location": "https://api.github.com/repos/hub4j-test-org/github-api-test/keys/78869617"
-    }
-  },
-  "uuid": "f648e6ad-c2ec-42b2-bc75-017ac64e67d9",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test_keys-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test_keys-4.json
deleted file mode 100644
index c1372692d..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test_keys-4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ca5ce05e-5052-4cce-9508-c33ba42ab18f",
-  "name": "repos_hub4j-test-org_github-api-test_keys",
-  "request": {
-    "url": "/repos/hub4j-test-org/github-api-test/keys",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_hub4j-test-org_github-api-test_keys-4.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 08 Mar 2023 22:36:50 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/\"0a77e8787fcd166b10430624945723c4d8bdc5f131bcc1c821d56170eec9db86\"",
-      "github-authentication-token-expiration": "2023-04-07 23:24:34 +0200",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "x-github-api-version-selected": "2022-11-28",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4901",
-      "X-RateLimit-Reset": "1678317208",
-      "X-RateLimit-Used": "99",
-      "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": "E5EA:3041:9E5EEE8:A0EE307:64090E02"
-    }
-  },
-  "uuid": "ca5ce05e-5052-4cce-9508-c33ba42ab18f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test_keys_78869617-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test_keys_78869617-5.json
deleted file mode 100644
index 833744f03..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/repos_hub4j-test-org_github-api-test_keys_78869617-5.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "id": "0fc8164e-80f8-450b-a7b5-4f604f9eeaa9",
-  "name": "repos_hub4j-test-org_github-api-test_keys_78869617",
-  "request": {
-    "url": "/repos/hub4j-test-org/github-api-test/keys/78869617",
-    "method": "DELETE",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3+json"
-      }
-    }
-  },
-  "response": {
-    "status": 204,
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 08 Mar 2023 22:36:51 GMT",
-      "github-authentication-token-expiration": "2023-04-07 23:24:34 +0200",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "x-github-api-version-selected": "2022-11-28",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4900",
-      "X-RateLimit-Reset": "1678317208",
-      "X-RateLimit-Used": "100",
-      "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'",
-      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "E5FA:A7AE:82F2BFE:8532045:64090E02"
-    }
-  },
-  "uuid": "0fc8164e-80f8-450b-a7b5-4f604f9eeaa9",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/user-1.json
deleted file mode 100644
index d46c6d045..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKey/mappings/user-1.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "9e6bf17e-5e07-4c66-ab42-eba00096c098",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-1.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 08 Mar 2023 22:36:44 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/\"e548710856e14da19e6d9c3a0b9e6751b4cec74b4ead51290d5179d92173e70e\"",
-      "Last-Modified": "Mon, 28 Nov 2022 20:54:46 GMT",
-      "github-authentication-token-expiration": "2023-04-07 23:24:34 +0200",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "x-github-api-version-selected": "2022-11-28",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4907",
-      "X-RateLimit-Reset": "1678317208",
-      "X-RateLimit-Used": "93",
-      "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": "AC20:E4F4:322E5E4:32FF236:64090DFB"
-    }
-  },
-  "uuid": "9e6bf17e-5e07-4c66-ab42-eba00096c098",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/repos_hub4j-test-org_github-api-test-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/repos_hub4j-test-org_github-api-test-2.json
deleted file mode 100644
index 2d5a6b55f..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/repos_hub4j-test-org_github-api-test-2.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  "id": 611473997,
-  "node_id": "R_kgDOJHJaTQ",
-  "name": "github-api-test",
-  "full_name": "hub4j-test-org/github-api-test",
-  "private": false,
-  "owner": {
-    "login": "hub4j-test-org",
-    "id": 238558,
-    "node_id": "MDQ6VXNlcjIzODU1OA==",
-    "avatar_url": "https://avatars.githubusercontent.com/u/238558?v=4",
-    "gravatar_id": "",
-    "url": "https://api.github.com/users/hub4j-test-org",
-    "html_url": "https://github.com/hub4j-test-org",
-    "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
-    "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
-    "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
-    "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
-    "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
-    "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
-    "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
-    "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
-    "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
-    "type": "User",
-    "site_admin": false
-  },
-  "html_url": "https://github.com/hub4j-test-org/github-api-test",
-  "description": "A test repository for testing the github-api project: github-api-test",
-  "fork": false,
-  "url": "https://api.github.com/repos/hub4j-test-org/github-api-test",
-  "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/forks",
-  "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/keys{/key_id}",
-  "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/collaborators{/collaborator}",
-  "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/teams",
-  "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/hooks",
-  "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/issues/events{/number}",
-  "events_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/events",
-  "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/assignees{/user}",
-  "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/branches{/branch}",
-  "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/tags",
-  "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/git/blobs{/sha}",
-  "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/git/tags{/sha}",
-  "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/git/refs{/sha}",
-  "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/git/trees{/sha}",
-  "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/statuses/{sha}",
-  "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/languages",
-  "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/stargazers",
-  "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/contributors",
-  "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/subscribers",
-  "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/subscription",
-  "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/commits{/sha}",
-  "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/git/commits{/sha}",
-  "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/comments{/number}",
-  "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/issues/comments{/number}",
-  "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/contents/{+path}",
-  "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/compare/{base}...{head}",
-  "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/merges",
-  "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/{archive_format}{/ref}",
-  "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/downloads",
-  "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/issues{/number}",
-  "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/pulls{/number}",
-  "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/milestones{/number}",
-  "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/notifications{?since,all,participating}",
-  "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/labels{/name}",
-  "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/releases{/id}",
-  "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api-test/deployments",
-  "created_at": "2023-03-08T22:36:45Z",
-  "updated_at": "2023-03-08T22:36:45Z",
-  "pushed_at": "2023-03-08T22:36:45Z",
-  "git_url": "git://github.com/hub4j-test-org/github-api-test.git",
-  "ssh_url": "git@github.com:hub4j-test-org/github-api-test.git",
-  "clone_url": "https://github.com/hub4j-test-org/github-api-test.git",
-  "svn_url": "https://github.com/hub4j-test-org/github-api-test",
-  "homepage": "http://github-api.kohsuke.org/",
-  "size": 0,
-  "stargazers_count": 0,
-  "watchers_count": 0,
-  "language": null,
-  "has_issues": true,
-  "has_projects": true,
-  "has_downloads": true,
-  "has_wiki": true,
-  "has_pages": false,
-  "has_discussions": false,
-  "forks_count": 0,
-  "mirror_url": null,
-  "archived": false,
-  "disabled": false,
-  "open_issues_count": 0,
-  "license": null,
-  "allow_forking": true,
-  "is_template": false,
-  "web_commit_signoff_required": false,
-  "topics": [],
-  "visibility": "public",
-  "forks": 0,
-  "open_issues": 0,
-  "watchers": 0,
-  "default_branch": "main",
-  "permissions": {
-    "admin": true,
-    "maintain": true,
-    "push": true,
-    "triage": true,
-    "pull": true
-  },
-  "security_and_analysis": {
-    "secret_scanning": {
-      "status": "disabled"
-    },
-    "secret_scanning_push_protection": {
-      "status": "disabled"
-    }
-  },
-  "network_count": 0,
-  "subscribers_count": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/repos_hub4j-test-org_github-api-test_keys-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/repos_hub4j-test-org_github-api-test_keys-3.json
deleted file mode 100644
index 6b1f155ad..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/repos_hub4j-test-org_github-api-test_keys-3.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "id": 78869617,
-  "key": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATWwMLytklB44O66isWRKOB3Qd7Ysc7q7EyWTmT0bG9",
-  "url": "https://api.github.com/repos/hub4j-test-org/github-api-test/keys/78869617",
-  "title": "test",
-  "verified": true,
-  "created_at": "2023-03-08T22:36:50Z",
-  "read_only": true,
-  "last_used": null,
-  "added_by": "hub4j-test-org"
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/repos_hub4j-test-org_github-api-test_keys-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/repos_hub4j-test-org_github-api-test_keys-4.json
deleted file mode 100644
index 7c1ba9beb..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/repos_hub4j-test-org_github-api-test_keys-4.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  {
-    "id": 78869617,
-    "key": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATWwMLytklB44O66isWRKOB3Qd7Ysc7q7EyWTmT0bG9",
-    "url": "https://api.github.com/repos/hub4j-test-org/github-api-test/keys/78869617",
-    "title": "test",
-    "verified": true,
-    "created_at": "2023-03-08T22:36:50Z",
-    "read_only": true,
-    "last_used": null,
-    "added_by": "hub4j-test-org"
-  }
-]
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/user-1.json
deleted file mode 100644
index 92e9ace93..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/__files/user-1.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "login": "hub4j-test-org",
-  "id": 7544739,
-  "node_id": "MDQ6VXNlcjIzODU1OA==",
-  "avatar_url": "https://avatars.githubusercontent.com/u/7544739?v=4",
-  "gravatar_id": "",
-  "url": "https://api.github.com/users/hub4j-test-org",
-  "html_url": "https://github.com/hub4j-test-org",
-  "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
-  "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
-  "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
-  "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
-  "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
-  "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
-  "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
-  "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
-  "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
-  "type": "User",
-  "site_admin": false,
-  "name": "hub4j-test-org",
-  "company": null,
-  "blog": "",
-  "location": "",
-  "email": null,
-  "hireable": null,
-  "bio": "",
-  "twitter_username": null,
-  "public_repos": 13,
-  "public_gists": 4,
-  "followers": 6,
-  "following": 1,
-  "created_at": "2010-04-07T08:30:12Z",
-  "updated_at": "2022-11-28T20:54:46Z"
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test-2.json
deleted file mode 100644
index 8764b8abe..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test-2.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "8b7ef826-893b-4288-b625-4492949cd9b1",
-  "name": "repos_hub4j-test-org_github-api-test",
-  "request": {
-    "url": "/repos/hub4j-test-org/github-api-test",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_hub4j-test-org_github-api-test-2.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 08 Mar 2023 22:36:49 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/\"9a25876ca00d328a54c1400dffe501009cdcbc3410dd90140b0c33cc19608961\"",
-      "Last-Modified": "Wed, 08 Mar 2023 22:36:45 GMT",
-      "github-authentication-token-expiration": "2023-04-07 23:24:34 +0200",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "x-github-api-version-selected": "2022-11-28",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4903",
-      "X-RateLimit-Reset": "1678317208",
-      "X-RateLimit-Used": "97",
-      "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": "E5D8:ACE5:B4A8F2D:B741C36:64090E01"
-    }
-  },
-  "uuid": "8b7ef826-893b-4288-b625-4492949cd9b1",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test_keys-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test_keys-3.json
deleted file mode 100644
index 3fee79387..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test_keys-3.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "id": "f648e6ad-c2ec-42b2-bc75-017ac64e67d9",
-  "name": "repos_hub4j-test-org_github-api-test_keys",
-  "request": {
-    "url": "/repos/hub4j-test-org/github-api-test/keys",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3+json"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"read_only\":true,\"title\":\"test\",\"key\":\"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIATWwMLytklB44O66isWRKOB3Qd7Ysc7q7EyWTmT0bG9 test@example.com\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": false
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_hub4j-test-org_github-api-test_keys-3.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 08 Mar 2023 22:36:50 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": "\"0a4e82c98d34824d431a19b779f7fcc35e1a3c1142ff9c1a7132d8840630f8a6\"",
-      "github-authentication-token-expiration": "2023-04-07 23:24:34 +0200",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "x-github-api-version-selected": "2022-11-28",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4902",
-      "X-RateLimit-Reset": "1678317208",
-      "X-RateLimit-Used": "98",
-      "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": "E5DE:A9BF:A40D94B:A69E360:64090E01",
-      "Location": "https://api.github.com/repos/hub4j-test-org/github-api-test/keys/78869617"
-    }
-  },
-  "uuid": "f648e6ad-c2ec-42b2-bc75-017ac64e67d9",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test_keys-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test_keys-4.json
deleted file mode 100644
index c1372692d..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test_keys-4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ca5ce05e-5052-4cce-9508-c33ba42ab18f",
-  "name": "repos_hub4j-test-org_github-api-test_keys",
-  "request": {
-    "url": "/repos/hub4j-test-org/github-api-test/keys",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_hub4j-test-org_github-api-test_keys-4.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 08 Mar 2023 22:36:50 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/\"0a77e8787fcd166b10430624945723c4d8bdc5f131bcc1c821d56170eec9db86\"",
-      "github-authentication-token-expiration": "2023-04-07 23:24:34 +0200",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "x-github-api-version-selected": "2022-11-28",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4901",
-      "X-RateLimit-Reset": "1678317208",
-      "X-RateLimit-Used": "99",
-      "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": "E5EA:3041:9E5EEE8:A0EE307:64090E02"
-    }
-  },
-  "uuid": "ca5ce05e-5052-4cce-9508-c33ba42ab18f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test_keys_78869617-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test_keys_78869617-5.json
deleted file mode 100644
index 833744f03..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/repos_hub4j-test-org_github-api-test_keys_78869617-5.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "id": "0fc8164e-80f8-450b-a7b5-4f604f9eeaa9",
-  "name": "repos_hub4j-test-org_github-api-test_keys_78869617",
-  "request": {
-    "url": "/repos/hub4j-test-org/github-api-test/keys/78869617",
-    "method": "DELETE",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3+json"
-      }
-    }
-  },
-  "response": {
-    "status": 204,
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 08 Mar 2023 22:36:51 GMT",
-      "github-authentication-token-expiration": "2023-04-07 23:24:34 +0200",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "x-github-api-version-selected": "2022-11-28",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4900",
-      "X-RateLimit-Reset": "1678317208",
-      "X-RateLimit-Used": "100",
-      "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'",
-      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "E5FA:A7AE:82F2BFE:8532045:64090E02"
-    }
-  },
-  "uuid": "0fc8164e-80f8-450b-a7b5-4f604f9eeaa9",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/user-1.json
deleted file mode 100644
index d46c6d045..000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testAddDeployKeyAsReadOnly/mappings/user-1.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "9e6bf17e-5e07-4c66-ab42-eba00096c098",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-1.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 08 Mar 2023 22:36:44 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/\"e548710856e14da19e6d9c3a0b9e6751b4cec74b4ead51290d5179d92173e70e\"",
-      "Last-Modified": "Mon, 28 Nov 2022 20:54:46 GMT",
-      "github-authentication-token-expiration": "2023-04-07 23:24:34 +0200",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "x-github-api-version-selected": "2022-11-28",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4907",
-      "X-RateLimit-Reset": "1678317208",
-      "X-RateLimit-Used": "93",
-      "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": "AC20:E4F4:322E5E4:32FF236:64090DFB"
-    }
-  },
-  "uuid": "9e6bf17e-5e07-4c66-ab42-eba00096c098",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json
index d4e5ff9ca..a4601c5f5 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "FLAT_RATE",
+        "price_model": "flat-rate",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-C43G2.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-C43G2.json
index 453cf942e..61647508a 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-C43G2.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/__files/body-marketplace_listing-stubbed-plans-C43G2.json
@@ -8,7 +8,7 @@
     "description": "A free CI solution",
     "monthly_price_in_cents": 0,
     "yearly_price_in_cents": 0,
-    "price_model": "FREE",
+    "price_model": "free",
     "has_free_trial": false,
     "state": "published",
     "unit_name": null,
@@ -27,7 +27,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "PER_UNIT",
+    "price_model": "per-unit",
     "state": "published",
     "unit_name": "seat",
     "bullets": [
@@ -45,7 +45,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "FLAT_RATE",
+    "price_model": "flat-rate",
     "state": "published",
     "unit_name": null,
     "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json
index 9892541ea..09a842376 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "FLAT_RATE",
+        "price_model": "flat-rate",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json
index 9892541ea..09a842376 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "FLAT_RATE",
+        "price_model": "flat-rate",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json
index 9892541ea..09a842376 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "FLAT_RATE",
+        "price_model": "flat-rate",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-uewkE.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-uewkE.json
index 453cf942e..61647508a 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-uewkE.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/__files/body-marketplace_listing-stubbed-plans-uewkE.json
@@ -8,7 +8,7 @@
     "description": "A free CI solution",
     "monthly_price_in_cents": 0,
     "yearly_price_in_cents": 0,
-    "price_model": "FREE",
+    "price_model": "free",
     "has_free_trial": false,
     "state": "published",
     "unit_name": null,
@@ -27,7 +27,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "PER_UNIT",
+    "price_model": "per-unit",
     "state": "published",
     "unit_name": "seat",
     "bullets": [
@@ -45,7 +45,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "FLAT_RATE",
+    "price_model": "flat-rate",
     "state": "published",
     "unit_name": null,
     "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-cz27N.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-cz27N.json
index 9892541ea..09a842376 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-cz27N.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-7-accounts-cz27N.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "FLAT_RATE",
+        "price_model": "flat-rate",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json
index 9892541ea..09a842376 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "FLAT_RATE",
+        "price_model": "flat-rate",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-VT77w.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-VT77w.json
index 9892541ea..09a842376 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-VT77w.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-9-accounts-VT77w.json
@@ -24,7 +24,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "FLAT_RATE",
+        "price_model": "flat-rate",
         "state": "published",
         "unit_name": null,
         "bullets": [
@@ -53,7 +53,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
@@ -80,7 +80,7 @@
         "monthly_price_in_cents": 1099,
         "yearly_price_in_cents": 11870,
         "has_free_trial": false,
-        "price_model": "PER_UNIT",
+        "price_model": "per-unit",
         "state": "published",
         "unit_name": "seat",
         "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-xk1MF.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-xk1MF.json
index 453cf942e..61647508a 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-xk1MF.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/__files/body-marketplace_listing-stubbed-plans-xk1MF.json
@@ -8,7 +8,7 @@
     "description": "A free CI solution",
     "monthly_price_in_cents": 0,
     "yearly_price_in_cents": 0,
-    "price_model": "FREE",
+    "price_model": "free",
     "has_free_trial": false,
     "state": "published",
     "unit_name": null,
@@ -27,7 +27,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "PER_UNIT",
+    "price_model": "per-unit",
     "state": "published",
     "unit_name": "seat",
     "bullets": [
@@ -45,7 +45,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "FLAT_RATE",
+    "price_model": "flat-rate",
     "state": "published",
     "unit_name": null,
     "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listMarketplacePlans/__files/body-marketplace_listing-stubbed-plans-ZDjdu.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listMarketplacePlans/__files/body-marketplace_listing-stubbed-plans-ZDjdu.json
index 453cf942e..61647508a 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listMarketplacePlans/__files/body-marketplace_listing-stubbed-plans-ZDjdu.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listMarketplacePlans/__files/body-marketplace_listing-stubbed-plans-ZDjdu.json
@@ -8,7 +8,7 @@
     "description": "A free CI solution",
     "monthly_price_in_cents": 0,
     "yearly_price_in_cents": 0,
-    "price_model": "FREE",
+    "price_model": "free",
     "has_free_trial": false,
     "state": "published",
     "unit_name": null,
@@ -27,7 +27,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "PER_UNIT",
+    "price_model": "per-unit",
     "state": "published",
     "unit_name": "seat",
     "bullets": [
@@ -45,7 +45,7 @@
     "monthly_price_in_cents": 1099,
     "yearly_price_in_cents": 11870,
     "has_free_trial": false,
-    "price_model": "FLAT_RATE",
+    "price_model": "flat-rate",
     "state": "published",
     "unit_name": null,
     "bullets": [
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMyMarketplacePurchases/__files/body-user-marketplace_purchases-stubbed-eVWvD.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMyMarketplacePurchases/__files/body-user-marketplace_purchases-stubbed-eVWvD.json
index 70cad368c..a74693a37 100644
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMyMarketplacePurchases/__files/body-user-marketplace_purchases-stubbed-eVWvD.json
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMyMarketplacePurchases/__files/body-user-marketplace_purchases-stubbed-eVWvD.json
@@ -24,7 +24,7 @@
       "monthly_price_in_cents": 1099,
       "yearly_price_in_cents": 11870,
       "has_free_trial": false,
-      "price_model": "FLAT_RATE",
+      "price_model": "flat-rate",
       "state": "published",
       "unit_name": null,
       "bullets": [
@@ -56,7 +56,7 @@
       "description": "A free CI solution",
       "monthly_price_in_cents": 0,
       "yearly_price_in_cents": 0,
-      "price_model": "FREE",
+      "price_model": "free",
       "has_free_trial": false,
       "state": "published",
       "unit_name": null,