From 1eb8bf97192e4e4527acaefe5bd53e88c006cb37 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Wed, 20 May 2020 18:58:05 -0700 Subject: [PATCH] Reduce round trips and cleanup test data --- .../java/org/kohsuke/github/GHRepository.java | 17 +- .../kohsuke/github/GHEventPayloadTest.java | 5 + .../repos_hub4j-test-org_github-api-3.json | 332 ------------------ .../repos_hub4j-test-org_github-api-5.json | 332 ------------------ .../__files/repos_hub4j_github-api-4.json | 132 ------- .../__files/repos_hub4j_github-api-6.json | 132 ------- ...4j_github-api_git_refs_heads_master-3.json | 10 + .../repos_hub4j-test-org_github-api-2.json | 3 - .../repos_hub4j-test-org_github-api-3.json | 50 --- .../repos_hub4j-test-org_github-api-5.json | 49 --- .../mappings/repos_hub4j_github-api-4.json | 50 --- ...j_github-api_git_refs_heads_master-3.json} | 27 +- 12 files changed, 39 insertions(+), 1100 deletions(-) delete mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-3.json delete mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-5.json delete mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api-4.json delete mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api-6.json create mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api_git_refs_heads_master-3.json delete mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-3.json delete mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-5.json delete mode 100644 src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api-4.json rename src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/{repos_hub4j_github-api-6.json => repos_hub4j_github-api_git_refs_heads_master-3.json} (64%) diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java index 373acc8fe..561c89176 100644 --- a/src/main/java/org/kohsuke/github/GHRepository.java +++ b/src/main/java/org/kohsuke/github/GHRepository.java @@ -2160,6 +2160,12 @@ public class GHRepository extends GHObject { if (root.isOffline() && owner != null) { owner.wrapUp(root); } + if (source != null) { + source.wrap(root); + } + if (parent != null) { + parent.wrap(root); + } return this; } @@ -2482,10 +2488,10 @@ public class GHRepository extends GHObject { if (fork && source == null) { populate(); } - if (source == null) + if (source == null) { return null; - if (source.root == null) - source = root.getRepository(source.getFullName()); + } + return source; } @@ -2504,10 +2510,9 @@ public class GHRepository extends GHObject { populate(); } - if (parent == null) + if (parent == null) { return null; - if (parent.root == null) - parent = root.getRepository(parent.getFullName()); + } return parent; } diff --git a/src/test/java/org/kohsuke/github/GHEventPayloadTest.java b/src/test/java/org/kohsuke/github/GHEventPayloadTest.java index 3ee988e05..b8dd31172 100644 --- a/src/test/java/org/kohsuke/github/GHEventPayloadTest.java +++ b/src/test/java/org/kohsuke/github/GHEventPayloadTest.java @@ -335,6 +335,10 @@ public class GHEventPayloadTest extends AbstractGitHubWireMockTest { is(mockGitHub.apiServer().baseUrl() + "/repos/hub4j-test-org/github-api")); assertThat(event.getRepository().getHttpTransportUrl(), is("https://github.com/hub4j-test-org/github-api.git")); + // ensure that root has been bound after populate + event.getRepository().getSource().getRef("heads/master"); + event.getRepository().getParent().getRef("heads/master"); + // Source event = gitHub.parseEventPayload(payload.asReader(mockGitHub::mapToMockGitHub), GHEventPayload.Push.class); assertThat(event.getRepository().getSource().getFullName(), is("hub4j/github-api")); @@ -342,6 +346,7 @@ public class GHEventPayloadTest extends AbstractGitHubWireMockTest { // Parent event = gitHub.parseEventPayload(payload.asReader(mockGitHub::mapToMockGitHub), GHEventPayload.Push.class); assertThat(event.getRepository().getParent().getFullName(), is("hub4j/github-api")); + } // TODO implement support classes and write test diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-3.json deleted file mode 100644 index 194a6c042..000000000 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-3.json +++ /dev/null @@ -1,332 +0,0 @@ -{ - "id": 206888201, - "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", - "name": "github-api", - "full_name": "hub4j-test-org/github-api", - "private": false, - "owner": { - "login": "hub4j-test-org", - "id": 7544739, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", - "avatar_url": "https://avatars3.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": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j-test-org/github-api", - "description": "Tricky", - "fork": true, - "url": "https://api.github.com/repos/hub4j-test-org/github-api", - "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", - "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2020-01-16T21:22:56Z", - "pushed_at": "2020-05-20T16:22:43Z", - "git_url": "git://github.com/hub4j-test-org/github-api.git", - "ssh_url": "git@github.com:hub4j-test-org/github-api.git", - "clone_url": "https://github.com/hub4j-test-org/github-api.git", - "svn_url": "https://github.com/hub4j-test-org/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 19035, - "stargazers_count": 0, - "watchers_count": 0, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 0, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 5, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 0, - "open_issues": 5, - "watchers": 0, - "default_branch": "master", - "permissions": { - "admin": true, - "push": true, - "pull": true - }, - "temp_clone_token": "", - "allow_squash_merge": true, - "allow_merge_commit": true, - "allow_rebase_merge": true, - "delete_branch_on_merge": false, - "organization": { - "login": "hub4j-test-org", - "id": 7544739, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", - "avatar_url": "https://avatars3.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": "Organization", - "site_admin": false - }, - "parent": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "hub4j/github-api", - "private": false, - "owner": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/hub4j/github-api", - "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2020-05-20T00:25:18Z", - "pushed_at": "2020-05-20T00:25:15Z", - "git_url": "git://github.com/hub4j/github-api.git", - "ssh_url": "git@github.com:hub4j/github-api.git", - "clone_url": "https://github.com/hub4j/github-api.git", - "svn_url": "https://github.com/hub4j/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 23100, - "stargazers_count": 655, - "watchers_count": 655, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 478, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 67, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 478, - "open_issues": 67, - "watchers": 655, - "default_branch": "master" - }, - "source": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "hub4j/github-api", - "private": false, - "owner": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/hub4j/github-api", - "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2020-05-20T00:25:18Z", - "pushed_at": "2020-05-20T00:25:15Z", - "git_url": "git://github.com/hub4j/github-api.git", - "ssh_url": "git@github.com:hub4j/github-api.git", - "clone_url": "https://github.com/hub4j/github-api.git", - "svn_url": "https://github.com/hub4j/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 23100, - "stargazers_count": 655, - "watchers_count": 655, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 478, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 67, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 478, - "open_issues": 67, - "watchers": 655, - "default_branch": "master" - }, - "network_count": 478, - "subscribers_count": 0 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-5.json deleted file mode 100644 index 194a6c042..000000000 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-5.json +++ /dev/null @@ -1,332 +0,0 @@ -{ - "id": 206888201, - "node_id": "MDEwOlJlcG9zaXRvcnkyMDY4ODgyMDE=", - "name": "github-api", - "full_name": "hub4j-test-org/github-api", - "private": false, - "owner": { - "login": "hub4j-test-org", - "id": 7544739, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", - "avatar_url": "https://avatars3.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": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j-test-org/github-api", - "description": "Tricky", - "fork": true, - "url": "https://api.github.com/repos/hub4j-test-org/github-api", - "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j-test-org/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments", - "created_at": "2019-09-06T23:26:04Z", - "updated_at": "2020-01-16T21:22:56Z", - "pushed_at": "2020-05-20T16:22:43Z", - "git_url": "git://github.com/hub4j-test-org/github-api.git", - "ssh_url": "git@github.com:hub4j-test-org/github-api.git", - "clone_url": "https://github.com/hub4j-test-org/github-api.git", - "svn_url": "https://github.com/hub4j-test-org/github-api", - "homepage": "http://github-api.kohsuke.org/", - "size": 19035, - "stargazers_count": 0, - "watchers_count": 0, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": false, - "forks_count": 0, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 5, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 0, - "open_issues": 5, - "watchers": 0, - "default_branch": "master", - "permissions": { - "admin": true, - "push": true, - "pull": true - }, - "temp_clone_token": "", - "allow_squash_merge": true, - "allow_merge_commit": true, - "allow_rebase_merge": true, - "delete_branch_on_merge": false, - "organization": { - "login": "hub4j-test-org", - "id": 7544739, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=", - "avatar_url": "https://avatars3.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": "Organization", - "site_admin": false - }, - "parent": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "hub4j/github-api", - "private": false, - "owner": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/hub4j/github-api", - "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2020-05-20T00:25:18Z", - "pushed_at": "2020-05-20T00:25:15Z", - "git_url": "git://github.com/hub4j/github-api.git", - "ssh_url": "git@github.com:hub4j/github-api.git", - "clone_url": "https://github.com/hub4j/github-api.git", - "svn_url": "https://github.com/hub4j/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 23100, - "stargazers_count": 655, - "watchers_count": 655, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 478, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 67, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 478, - "open_issues": 67, - "watchers": 655, - "default_branch": "master" - }, - "source": { - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "hub4j/github-api", - "private": false, - "owner": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/hub4j/github-api", - "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2020-05-20T00:25:18Z", - "pushed_at": "2020-05-20T00:25:15Z", - "git_url": "git://github.com/hub4j/github-api.git", - "ssh_url": "git@github.com:hub4j/github-api.git", - "clone_url": "https://github.com/hub4j/github-api.git", - "svn_url": "https://github.com/hub4j/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 23100, - "stargazers_count": 655, - "watchers_count": 655, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 478, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 67, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 478, - "open_issues": 67, - "watchers": 655, - "default_branch": "master" - }, - "network_count": 478, - "subscribers_count": 0 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api-4.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api-4.json deleted file mode 100644 index 4ad16658c..000000000 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api-4.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "hub4j/github-api", - "private": false, - "owner": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/hub4j/github-api", - "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2020-05-20T00:25:18Z", - "pushed_at": "2020-05-20T00:25:15Z", - "git_url": "git://github.com/hub4j/github-api.git", - "ssh_url": "git@github.com:hub4j/github-api.git", - "clone_url": "https://github.com/hub4j/github-api.git", - "svn_url": "https://github.com/hub4j/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 23100, - "stargazers_count": 655, - "watchers_count": 655, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 478, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 67, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 478, - "open_issues": 67, - "watchers": 655, - "default_branch": "master", - "permissions": { - "admin": true, - "push": true, - "pull": true - }, - "temp_clone_token": "", - "allow_squash_merge": true, - "allow_merge_commit": true, - "allow_rebase_merge": true, - "delete_branch_on_merge": false, - "organization": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "network_count": 478, - "subscribers_count": 46 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api-6.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api-6.json deleted file mode 100644 index 4ad16658c..000000000 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api-6.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "id": 617210, - "node_id": "MDEwOlJlcG9zaXRvcnk2MTcyMTA=", - "name": "github-api", - "full_name": "hub4j/github-api", - "private": false, - "owner": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "html_url": "https://github.com/hub4j/github-api", - "description": "Java API for GitHub", - "fork": false, - "url": "https://api.github.com/repos/hub4j/github-api", - "forks_url": "https://api.github.com/repos/hub4j/github-api/forks", - "keys_url": "https://api.github.com/repos/hub4j/github-api/keys{/key_id}", - "collaborators_url": "https://api.github.com/repos/hub4j/github-api/collaborators{/collaborator}", - "teams_url": "https://api.github.com/repos/hub4j/github-api/teams", - "hooks_url": "https://api.github.com/repos/hub4j/github-api/hooks", - "issue_events_url": "https://api.github.com/repos/hub4j/github-api/issues/events{/number}", - "events_url": "https://api.github.com/repos/hub4j/github-api/events", - "assignees_url": "https://api.github.com/repos/hub4j/github-api/assignees{/user}", - "branches_url": "https://api.github.com/repos/hub4j/github-api/branches{/branch}", - "tags_url": "https://api.github.com/repos/hub4j/github-api/tags", - "blobs_url": "https://api.github.com/repos/hub4j/github-api/git/blobs{/sha}", - "git_tags_url": "https://api.github.com/repos/hub4j/github-api/git/tags{/sha}", - "git_refs_url": "https://api.github.com/repos/hub4j/github-api/git/refs{/sha}", - "trees_url": "https://api.github.com/repos/hub4j/github-api/git/trees{/sha}", - "statuses_url": "https://api.github.com/repos/hub4j/github-api/statuses/{sha}", - "languages_url": "https://api.github.com/repos/hub4j/github-api/languages", - "stargazers_url": "https://api.github.com/repos/hub4j/github-api/stargazers", - "contributors_url": "https://api.github.com/repos/hub4j/github-api/contributors", - "subscribers_url": "https://api.github.com/repos/hub4j/github-api/subscribers", - "subscription_url": "https://api.github.com/repos/hub4j/github-api/subscription", - "commits_url": "https://api.github.com/repos/hub4j/github-api/commits{/sha}", - "git_commits_url": "https://api.github.com/repos/hub4j/github-api/git/commits{/sha}", - "comments_url": "https://api.github.com/repos/hub4j/github-api/comments{/number}", - "issue_comment_url": "https://api.github.com/repos/hub4j/github-api/issues/comments{/number}", - "contents_url": "https://api.github.com/repos/hub4j/github-api/contents/{+path}", - "compare_url": "https://api.github.com/repos/hub4j/github-api/compare/{base}...{head}", - "merges_url": "https://api.github.com/repos/hub4j/github-api/merges", - "archive_url": "https://api.github.com/repos/hub4j/github-api/{archive_format}{/ref}", - "downloads_url": "https://api.github.com/repos/hub4j/github-api/downloads", - "issues_url": "https://api.github.com/repos/hub4j/github-api/issues{/number}", - "pulls_url": "https://api.github.com/repos/hub4j/github-api/pulls{/number}", - "milestones_url": "https://api.github.com/repos/hub4j/github-api/milestones{/number}", - "notifications_url": "https://api.github.com/repos/hub4j/github-api/notifications{?since,all,participating}", - "labels_url": "https://api.github.com/repos/hub4j/github-api/labels{/name}", - "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}", - "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments", - "created_at": "2010-04-19T04:13:03Z", - "updated_at": "2020-05-20T00:25:18Z", - "pushed_at": "2020-05-20T00:25:15Z", - "git_url": "git://github.com/hub4j/github-api.git", - "ssh_url": "git@github.com:hub4j/github-api.git", - "clone_url": "https://github.com/hub4j/github-api.git", - "svn_url": "https://github.com/hub4j/github-api", - "homepage": "https://github-api.kohsuke.org/", - "size": 23100, - "stargazers_count": 655, - "watchers_count": 655, - "language": "Java", - "has_issues": true, - "has_projects": true, - "has_downloads": true, - "has_wiki": true, - "has_pages": true, - "forks_count": 478, - "mirror_url": null, - "archived": false, - "disabled": false, - "open_issues_count": 67, - "license": { - "key": "mit", - "name": "MIT License", - "spdx_id": "MIT", - "url": "https://api.github.com/licenses/mit", - "node_id": "MDc6TGljZW5zZTEz" - }, - "forks": 478, - "open_issues": 67, - "watchers": 655, - "default_branch": "master", - "permissions": { - "admin": true, - "push": true, - "pull": true - }, - "temp_clone_token": "", - "allow_squash_merge": true, - "allow_merge_commit": true, - "allow_rebase_merge": true, - "delete_branch_on_merge": false, - "organization": { - "login": "hub4j", - "id": 54909825, - "node_id": "MDEyOk9yZ2FuaXphdGlvbjU0OTA5ODI1", - "avatar_url": "https://avatars3.githubusercontent.com/u/54909825?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/hub4j", - "html_url": "https://github.com/hub4j", - "followers_url": "https://api.github.com/users/hub4j/followers", - "following_url": "https://api.github.com/users/hub4j/following{/other_user}", - "gists_url": "https://api.github.com/users/hub4j/gists{/gist_id}", - "starred_url": "https://api.github.com/users/hub4j/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/hub4j/subscriptions", - "organizations_url": "https://api.github.com/users/hub4j/orgs", - "repos_url": "https://api.github.com/users/hub4j/repos", - "events_url": "https://api.github.com/users/hub4j/events{/privacy}", - "received_events_url": "https://api.github.com/users/hub4j/received_events", - "type": "Organization", - "site_admin": false - }, - "network_count": 478, - "subscribers_count": 46 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api_git_refs_heads_master-3.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api_git_refs_heads_master-3.json new file mode 100644 index 000000000..aa53adf4d --- /dev/null +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j_github-api_git_refs_heads_master-3.json @@ -0,0 +1,10 @@ +{ + "ref": "refs/heads/master", + "node_id": "MDM6UmVmNjE3MjEwOnJlZnMvaGVhZHMvbWFzdGVy", + "url": "https://api.github.com/repos/hub4j/github-api/git/refs/heads/master", + "object": { + "sha": "ba12efea9d8604cad5c174620628aceb1fe224fb", + "type": "commit", + "url": "https://api.github.com/repos/hub4j/github-api/git/commits/ba12efea9d8604cad5c174620628aceb1fe224fb" + } +} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-2.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-2.json index 051723473..e3d32d748 100644 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-2.json +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-2.json @@ -43,8 +43,5 @@ }, "uuid": "90aa0017-3f50-4829-bda4-6531fbcfba60", "persistent": true, - "scenarioName": "scenario-1-repos-hub4j-test-org-github-api", - "requiredScenarioState": "Started", - "newScenarioState": "scenario-1-repos-hub4j-test-org-github-api-2", "insertionIndex": 2 } \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-3.json deleted file mode 100644 index b2b4568ad..000000000 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-3.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "id": "fa188857-d32a-4c98-8a48-9d9392c7cb0b", - "name": "repos_hub4j-test-org_github-api", - "request": { - "url": "/repos/hub4j-test-org/github-api", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repos_hub4j-test-org_github-api-3.json", - "headers": { - "Date": "Wed, 20 May 2020 20:11:32 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4996", - "X-RateLimit-Reset": "1590009090", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"c8baf5cd9feb904ed7ded78b091ebdf0\"", - "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT", - "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "DAE4:7DBC:8D547:AA079:5EC58EF4" - } - }, - "uuid": "fa188857-d32a-4c98-8a48-9d9392c7cb0b", - "persistent": true, - "scenarioName": "scenario-1-repos-hub4j-test-org-github-api", - "requiredScenarioState": "scenario-1-repos-hub4j-test-org-github-api-2", - "newScenarioState": "scenario-1-repos-hub4j-test-org-github-api-3", - "insertionIndex": 3 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-5.json deleted file mode 100644 index 1847cca8c..000000000 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-5.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "id": "29659ee2-772c-4353-b8c7-5afb29bfc3f6", - "name": "repos_hub4j-test-org_github-api", - "request": { - "url": "/repos/hub4j-test-org/github-api", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repos_hub4j-test-org_github-api-5.json", - "headers": { - "Date": "Wed, 20 May 2020 20:11:33 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4994", - "X-RateLimit-Reset": "1590009090", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"c8baf5cd9feb904ed7ded78b091ebdf0\"", - "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT", - "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "DAE4:7DBC:8D593:AA0BB:5EC58EF4" - } - }, - "uuid": "29659ee2-772c-4353-b8c7-5afb29bfc3f6", - "persistent": true, - "scenarioName": "scenario-1-repos-hub4j-test-org-github-api", - "requiredScenarioState": "scenario-1-repos-hub4j-test-org-github-api-3", - "insertionIndex": 5 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api-4.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api-4.json deleted file mode 100644 index 61dc6f0bb..000000000 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api-4.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "id": "449077b8-e682-4e3e-b80f-a9ec3347fa7a", - "name": "repos_hub4j_github-api", - "request": { - "url": "/repos/hub4j/github-api", - "method": "GET", - "headers": { - "Accept": { - "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" - } - } - }, - "response": { - "status": 200, - "bodyFileName": "repos_hub4j_github-api-4.json", - "headers": { - "Date": "Wed, 20 May 2020 20:11:32 GMT", - "Content-Type": "application/json; charset=utf-8", - "Server": "GitHub.com", - "Status": "200 OK", - "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4995", - "X-RateLimit-Reset": "1590009090", - "Cache-Control": "private, max-age=60, s-maxage=60", - "Vary": [ - "Accept, Authorization, Cookie, X-GitHub-OTP", - "Accept-Encoding, Accept, X-Requested-With", - "Accept-Encoding" - ], - "ETag": "W/\"24ff65b42c6bd1a74e1d96154c53a21a\"", - "Last-Modified": "Wed, 20 May 2020 00:25:18 GMT", - "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", - "X-Accepted-OAuth-Scopes": "repo", - "X-GitHub-Media-Type": "unknown, github.v3", - "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", - "X-Frame-Options": "deny", - "X-Content-Type-Options": "nosniff", - "X-XSS-Protection": "1; mode=block", - "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", - "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "DAE4:7DBC:8D556:AA0A7:5EC58EF4" - } - }, - "uuid": "449077b8-e682-4e3e-b80f-a9ec3347fa7a", - "persistent": true, - "scenarioName": "scenario-2-repos-hub4j-github-api", - "requiredScenarioState": "Started", - "newScenarioState": "scenario-2-repos-hub4j-github-api-2", - "insertionIndex": 4 -} \ No newline at end of file diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api-6.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api_git_refs_heads_master-3.json similarity index 64% rename from src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api-6.json rename to src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api_git_refs_heads_master-3.json index 97ee7eb2b..28e044682 100644 --- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api-6.json +++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api_git_refs_heads_master-3.json @@ -1,8 +1,8 @@ { - "id": "ddd499e6-c400-462b-90a9-6ccd19c6985f", - "name": "repos_hub4j_github-api", + "id": "79569c1e-168b-4816-930b-1ac370e164b9", + "name": "repos_hub4j_github-api_git_refs_heads_master", "request": { - "url": "/repos/hub4j/github-api", + "url": "/repos/hub4j/github-api/git/refs/heads/master", "method": "GET", "headers": { "Accept": { @@ -12,23 +12,24 @@ }, "response": { "status": 200, - "bodyFileName": "repos_hub4j_github-api-6.json", + "bodyFileName": "repos_hub4j_github-api_git_refs_heads_master-3.json", "headers": { - "Date": "Wed, 20 May 2020 20:11:33 GMT", + "Date": "Thu, 21 May 2020 01:53:46 GMT", "Content-Type": "application/json; charset=utf-8", "Server": "GitHub.com", "Status": "200 OK", "X-RateLimit-Limit": "5000", - "X-RateLimit-Remaining": "4993", - "X-RateLimit-Reset": "1590009090", + "X-RateLimit-Remaining": "4998", + "X-RateLimit-Reset": "1590029625", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding, Accept, X-Requested-With", "Accept-Encoding" ], - "ETag": "W/\"24ff65b42c6bd1a74e1d96154c53a21a\"", - "Last-Modified": "Wed, 20 May 2020 00:25:18 GMT", + "ETag": "W/\"26677f2557ca0b327908d0e7832aea69\"", + "Last-Modified": "Wed, 20 May 2020 22:54:46 GMT", + "X-Poll-Interval": "300", "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion", "X-Accepted-OAuth-Scopes": "repo", "X-GitHub-Media-Type": "unknown, github.v3", @@ -38,12 +39,10 @@ "X-XSS-Protection": "1; mode=block", "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin", "Content-Security-Policy": "default-src 'none'", - "X-GitHub-Request-Id": "DAE4:7DBC:8D5A7:AA10A:5EC58EF5" + "X-GitHub-Request-Id": "C6EA:403C:271AF9:2E9847:5EC5DF2A" } }, - "uuid": "ddd499e6-c400-462b-90a9-6ccd19c6985f", + "uuid": "79569c1e-168b-4816-930b-1ac370e164b9", "persistent": true, - "scenarioName": "scenario-2-repos-hub4j-github-api", - "requiredScenarioState": "scenario-2-repos-hub4j-github-api-2", - "insertionIndex": 6 + "insertionIndex": 3 } \ No newline at end of file