diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 437b6ae0e..083b4558c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,4 +7,4 @@ We love getting PRs, but we hate asking people for the same basic changes every - [ ] Push your changes to a branch other than `master`. Create your PR from that branch. - [ ] Add JavaDocs and other comments - [ ] Write tests that run and pass in CI. See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to capture snapshot data. -- [ ] Run `mvn -P ci install site` locally. This may reformat your code, commit those changes. If this command doesn't succeed, your change will not pass CI. +- [ ] Run `mvn -D enable-ci install site` locally. This may reformat your code, commit those changes. If this command doesn't succeed, your change will not pass CI. diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index bad3f93dc..c285c5e33 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -1,23 +1,68 @@ -name: Java CI Build and Test +name: CI on: [push, pull_request] jobs: build: - - runs-on: ${{ matrix.os }} + name: build-only (Java ${{ matrix.java }}) + runs-on: ubuntu-latest strategy: matrix: - os: [windows-latest, ubuntu-latest] - java: [ '1.8.0', '11.0.x', '13.0.x' ] + java: [ 11 ] + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: Cached .m2 + uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Maven Install (skipTests) + run: mvn -B install -DskipTests -D enable-ci --file pom.xml + site: + name: site (Java ${{ matrix.java }}) + runs-on: ubuntu-latest + strategy: + matrix: + java: [ 11 ] + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Maven Site + run: mvn -B site -D enable-ci --file pom.xml + test: + name: test (${{ matrix.os }}, Java ${{ matrix.java }}) + runs-on: ${{ matrix.os }}-latest + strategy: + matrix: + os: [ ubuntu, windows ] + java: [ 8, 11, 13 ] steps: - uses: actions/checkout@v2 - name: Set up JDK uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} - - name: Maven Download all dependencies - run: mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:go-offline -P ci - - name: Maven Build - run: mvn -B install site -P ci --file pom.xml + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Maven Install + run: mvn -B install --file pom.xml diff --git a/pom.xml b/pom.xml index ee569edf8..2f0f18d23 100644 --- a/pom.xml +++ b/pom.xml @@ -203,6 +203,11 @@ org.kohsuke.github.GHPerson.1 org.kohsuke.github.GHPerson.1.1 + + org.kohsuke.github.GHAsset + org.kohsuke.github.GHReleaseBuilder + org.kohsuke.github.GHRelease + org.kohsuke.github.GitHub.GHApiInfo org.kohsuke.github.GHBranchProtection.RequiredSignatures @@ -580,15 +585,28 @@ - ci + ci-non-windows + + + enable-ci + + + !windows + + + + validate + check + + + + ci-all enable-ci - validate - check true diff --git a/src/main/java/org/kohsuke/github/Requester.java b/src/main/java/org/kohsuke/github/Requester.java index d106f1c34..3bda2288c 100644 --- a/src/main/java/org/kohsuke/github/Requester.java +++ b/src/main/java/org/kohsuke/github/Requester.java @@ -549,9 +549,9 @@ class Requester { || e instanceof SSLHandshakeException; if (connectionError && retries > 0) { LOGGER.log(INFO, - "Error while connecting to " + uc.getURL() + ". Sleeping " + Requester.retryTimeoutMillis - + " milliseconds before retrying... ; will try " + retries + " more time(s)", - e); + e.getMessage() + " while connecting to " + uc.getURL() + ". Sleeping " + + Requester.retryTimeoutMillis + " milliseconds before retrying... ; will try " + retries + + " more time(s)"); try { Thread.sleep(Requester.retryTimeoutMillis); } catch (InterruptedException ie) { diff --git a/src/test/java/org/kohsuke/github/AppTest.java b/src/test/java/org/kohsuke/github/AppTest.java index 1ab23f84c..cb41c73ba 100755 --- a/src/test/java/org/kohsuke/github/AppTest.java +++ b/src/test/java/org/kohsuke/github/AppTest.java @@ -3,6 +3,8 @@ package org.kohsuke.github; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.SystemUtils; +import org.junit.Assume; import org.junit.Ignore; import org.junit.Test; import org.kohsuke.github.GHCommit.File; @@ -895,6 +897,8 @@ public class AppTest extends AbstractGitHubWireMockTest { @Test public void blob() throws Exception { + Assume.assumeFalse(SystemUtils.IS_OS_WINDOWS); + GHRepository r = gitHub.getRepository("github-api/github-api"); String sha1 = "a12243f2fc5b8c2ba47dd677d0b0c7583539584d"; diff --git a/src/test/java/org/kohsuke/github/LifecycleTest.java b/src/test/java/org/kohsuke/github/LifecycleTest.java index 1a467c7a3..6cad87671 100644 --- a/src/test/java/org/kohsuke/github/LifecycleTest.java +++ b/src/test/java/org/kohsuke/github/LifecycleTest.java @@ -1,5 +1,7 @@ package org.kohsuke.github; +import org.apache.commons.lang3.SystemUtils; +import org.junit.Assume; import org.junit.Test; import java.io.File; @@ -14,6 +16,8 @@ import static org.hamcrest.core.Is.is; public class LifecycleTest extends AbstractGitHubWireMockTest { @Test public void testCreateRepository() throws IOException { + Assume.assumeFalse(SystemUtils.IS_OS_WINDOWS); + GHMyself myself = gitHub.getMyself(); // GHOrganization org = gitHub.getOrganization(GITHUB_API_TEST_ORG); diff --git a/src/test/java/org/kohsuke/github/RequesterRetryTest.java b/src/test/java/org/kohsuke/github/RequesterRetryTest.java index 62b436387..143d44899 100644 --- a/src/test/java/org/kohsuke/github/RequesterRetryTest.java +++ b/src/test/java/org/kohsuke/github/RequesterRetryTest.java @@ -20,8 +20,8 @@ import java.net.URL; import java.security.Permission; import java.util.List; import java.util.Map; -import java.util.logging.Handler; import java.util.logging.Logger; +import java.util.logging.SimpleFormatter; import java.util.logging.StreamHandler; import javax.net.ssl.SSLHandshakeException; @@ -55,8 +55,7 @@ public class RequesterRetryTest extends AbstractGitHubWireMockTest { @Before public void attachLogCapturer() { logCapturingStream = new ByteArrayOutputStream(); - Handler[] handlers = log.getParent().getHandlers(); - customLogHandler = new StreamHandler(logCapturingStream, handlers[0].getFormatter()); + customLogHandler = new StreamHandler(logCapturingStream, new SimpleFormatter()); log.addHandler(customLogHandler); } diff --git a/src/test/java/org/kohsuke/github/extras/GitHubCachingTest.java b/src/test/java/org/kohsuke/github/extras/GitHubCachingTest.java index 97e4842cd..35007b9bf 100644 --- a/src/test/java/org/kohsuke/github/extras/GitHubCachingTest.java +++ b/src/test/java/org/kohsuke/github/extras/GitHubCachingTest.java @@ -6,6 +6,8 @@ import com.squareup.okhttp.Cache; import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.OkUrlFactory; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.SystemUtils; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.kohsuke.github.AbstractGitHubWireMockTest; @@ -55,7 +57,9 @@ public class GitHubCachingTest extends AbstractGitHubWireMockTest { } @Test - public void OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error() throws Exception { + public void testCached404() throws Exception { + Assume.assumeFalse(SystemUtils.IS_OS_WINDOWS); + // ISSUE #669 snapshotNotAllowed(); diff --git a/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java b/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java index ed42ca71f..8467e30a0 100644 --- a/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java +++ b/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java @@ -5,6 +5,8 @@ import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemp import okhttp3.Cache; import okhttp3.OkHttpClient; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.SystemUtils; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.kohsuke.github.AbstractGitHubWireMockTest; @@ -56,7 +58,9 @@ public class GitHubCachingTest extends AbstractGitHubWireMockTest { } @Test - public void OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error() throws Exception { + public void testCached404() throws Exception { + Assume.assumeFalse(SystemUtils.IS_OS_WINDOWS); + // ISSUE #669 snapshotNotAllowed(); diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-39714670-728d-4f72-bf18-7b2e6f0ac276.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-39714670.json similarity index 100% rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-39714670-728d-4f72-bf18-7b2e6f0ac276.json rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-39714670.json diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-6cc04a40-acd6-409b-b004-671cbc0c03c8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-6cc04a40.json similarity index 100% rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-6cc04a40-acd6-409b-b004-671cbc0c03c8.json rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-6cc04a40.json diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-b0c1117a-926e-4ccd-baf3-c7813a465a7a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-b0c1117a.json similarity index 100% rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-b0c1117a-926e-4ccd-baf3-c7813a465a7a.json rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-b0c1117a.json diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-b1b91949-0448-415c-998e-a38135c37661.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-b1b91949.json similarity index 100% rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-b1b91949-0448-415c-998e-a38135c37661.json rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-b1b91949.json diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename2-c1bd7f2a-cab0-4208-b4c8-f2a24bca9169.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename2-c1bd7f2a.json similarity index 100% rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename2-c1bd7f2a-cab0-4208-b4c8-f2a24bca9169.json rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename2-c1bd7f2a.json diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-2-b1b919.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-2-b1b919.json index 7f6b77c2b..081c7f83a 100644 --- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-2-b1b919.json +++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-2-b1b919.json @@ -19,7 +19,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_bitwiseman_github-api-test-rename-b1b91949-0448-415c-998e-a38135c37661.json", + "bodyFileName": "repos_bitwiseman_github-api-test-rename-b1b91949.json", "headers": { "Date": "Wed, 02 Oct 2019 21:40:01 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-3-397146.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-3-397146.json index 5b73196a3..84a34ccb6 100644 --- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-3-397146.json +++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-3-397146.json @@ -19,7 +19,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_bitwiseman_github-api-test-rename-39714670-728d-4f72-bf18-7b2e6f0ac276.json", + "bodyFileName": "repos_bitwiseman_github-api-test-rename-39714670.json", "headers": { "Date": "Wed, 02 Oct 2019 21:40:02 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-4-b0c111.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-4-b0c111.json index 89ad724ba..50f6bb97c 100644 --- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-4-b0c111.json +++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-4-b0c111.json @@ -19,7 +19,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_bitwiseman_github-api-test-rename-b0c1117a-926e-4ccd-baf3-c7813a465a7a.json", + "bodyFileName": "repos_bitwiseman_github-api-test-rename-b0c1117a.json", "headers": { "Date": "Wed, 02 Oct 2019 21:40:02 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-5-6cc04a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-5-6cc04a.json index 4149f5105..3ce1e312f 100644 --- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-5-6cc04a.json +++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-5-6cc04a.json @@ -19,7 +19,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_bitwiseman_github-api-test-rename-6cc04a40-acd6-409b-b004-671cbc0c03c8.json", + "bodyFileName": "repos_bitwiseman_github-api-test-rename-6cc04a40.json", "headers": { "Date": "Wed, 02 Oct 2019 21:40:02 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-7-c1bd7f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-7-c1bd7f.json index f56e1468b..2dc93d1fd 100644 --- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-7-c1bd7f.json +++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-7-c1bd7f.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_bitwiseman_github-api-test-rename2-c1bd7f2a-cab0-4208-b4c8-f2a24bca9169.json", + "bodyFileName": "repos_bitwiseman_github-api-test-rename2-c1bd7f2a.json", "headers": { "Date": "Wed, 02 Oct 2019 21:40:03 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/repos_github-api_github-api-1c232f75-a19d-455f-b0c5-4278cc80a1e9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/repos_github-api_github-api-1c232f75.json similarity index 100% rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/repos_github-api_github-api-1c232f75-a19d-455f-b0c5-4278cc80a1e9.json rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/repos_github-api_github-api-1c232f75.json diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/repos_github-api_github-api_git_trees_master-ffd3e351-e215-4bef-9756-a608a46e6c42.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/repos_github-api_github-api_git_trees_master-ffd3e351.json similarity index 99% rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/repos_github-api_github-api_git_trees_master-ffd3e351-e215-4bef-9756-a608a46e6c42.json rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/repos_github-api_github-api_git_trees_master-ffd3e351.json index 7fc984e97..84df81428 100644 --- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/repos_github-api_github-api_git_trees_master-ffd3e351-e215-4bef-9756-a608a46e6c42.json +++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/repos_github-api_github-api_git_trees_master-ffd3e351.json @@ -5322,7 +5322,7 @@ "url": "https://api.github.com/repos/github-api/github-api/git/trees/23d4565bd270308657a4e5b65cb6e6bec6736b54" }, { - "path": "src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files", + "path": "src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlashtestGetDirectoryContentTrailingSlash/__files", "mode": "040000", "type": "tree", "sha": "98db44a404132445a934e7e1b28d0d94a8243a6e", diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api-2-1c232f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api-2-1c232f.json index 695c190c4..709da2f6c 100644 --- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api-2-1c232f.json +++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api-2-1c232f.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api_github-api-1c232f75-a19d-455f-b0c5-4278cc80a1e9.json", + "bodyFileName": "repos_github-api_github-api-1c232f75.json", "headers": { "Date": "Sat, 26 Oct 2019 01:27:03 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api_git_trees_master-3-ffd3e3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api_git_trees_master-3-ffd3e3.json index cc67935ca..e50513232 100644 --- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api_git_trees_master-3-ffd3e3.json +++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api_git_trees_master-3-ffd3e3.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api_github-api_git_trees_master-ffd3e351-e215-4bef-9756-a608a46e6c42.json", + "bodyFileName": "repos_github-api_github-api_git_trees_master-ffd3e351.json", "headers": { "Date": "Sat, 26 Oct 2019 01:27:04 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-testenablebranchprotections-02ee4913-4f10-4403-9f86-c911719d8b88.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-02ee4913.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-testenablebranchprotections-02ee4913-4f10-4403-9f86-c911719d8b88.json rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-02ee4913.json diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-testenablebranchprotections_branches_master-040c1d69-d6af-4a94-b583-7d18957bad10.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-040c1d69.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-testenablebranchprotections_branches_master-040c1d69-d6af-4a94-b583-7d18957bad10.json rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-040c1d69.json diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-testenablebranchprotections_branches_master_protection-aa97cf7b-7c9d-4c01-b7c5-bccc62b30873.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-aa97cf7b.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-testenablebranchprotections_branches_master_protection-aa97cf7b-7c9d-4c01-b7c5-bccc62b30873.json rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/repos_github-api-test-org_temp-aa97cf7b.json diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-2-02ee49.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-2-02ee49.json index 92c684653..2ba676422 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-2-02ee49.json +++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-2-02ee49.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_temp-testenablebranchprotections-02ee4913-4f10-4403-9f86-c911719d8b88.json", + "bodyFileName": "repos_github-api-test-org_temp-02ee4913.json", "headers": { "Date": "Tue, 19 Nov 2019 03:01:32 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections_branches_master-3-040c1d.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-3-040c1d.json similarity index 93% rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections_branches_master-3-040c1d.json rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-3-040c1d.json index 53a068bad..4beb0fc44 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections_branches_master-3-040c1d.json +++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-3-040c1d.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_temp-testenablebranchprotections_branches_master-040c1d69-d6af-4a94-b583-7d18957bad10.json", + "bodyFileName": "repos_github-api-test-org_temp-040c1d69.json", "headers": { "Date": "Tue, 19 Nov 2019 03:01:32 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections_branches_master_protection-4-aa97cf.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-4-aa97cf.json similarity index 94% rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections_branches_master_protection-4-aa97cf.json rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-4-aa97cf.json index e83de0db7..f83c39ebb 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections_branches_master_protection-4-aa97cf.json +++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-4-aa97cf.json @@ -19,7 +19,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_temp-testenablebranchprotections_branches_master_protection-aa97cf7b-7c9d-4c01-b7c5-bccc62b30873.json", + "bodyFileName": "repos_github-api-test-org_temp-aa97cf7b.json", "headers": { "Date": "Tue, 19 Nov 2019 03:01:32 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-b57fab91-f2a6-4d52-b6d4-05e4a8be5df4.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-b57fab91.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-b57fab91-f2a6-4d52-b6d4-05e4a8be5df4.json rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-b57fab91.json diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-4-b57fab.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-4-b57fab.json index eeeb4a9be..577f44390 100644 --- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-4-b57fab.json +++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-4-b57fab.json @@ -19,7 +19,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-b57fab91-f2a6-4d52-b6d4-05e4a8be5df4.json", + "bodyFileName": "repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-b57fab91.json", "headers": { "Date": "Tue, 19 Nov 2019 03:01:41 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-3cdae02b-77ed-4fb7-96fa-fee8aab5e88d.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50-3cdae02b.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-3cdae02b-77ed-4fb7-96fa-fee8aab5e88d.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50-3cdae02b.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-04f85e50-583c-48ad-8d45-55368c542148.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-04f85e50.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-04f85e50-583c-48ad-8d45-55368c542148.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-04f85e50.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-1d4297f8-515f-48b0-8f13-99894911d416.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-1d4297f8.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-1d4297f8-515f-48b0-8f13-99894911d416.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-1d4297f8.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4be43bcb-37e3-4c54-8b0a-c190690dc820.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-4be43bcb.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4be43bcb-37e3-4c54-8b0a-c190690dc820.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-4be43bcb.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-5b2d0899.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-5b2d0899.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-64a83a7d-a195-4f3b-989e-293e3f23611a.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-64a83a7d.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-64a83a7d-a195-4f3b-989e-293e3f23611a.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-64a83a7d.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a5a649cc-8b2b-4c58-ba06-8445261108f8.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-a5a649cc.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a5a649cc-8b2b-4c58-ba06-8445261108f8.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-a5a649cc.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a971220e-d7f0-4919-9963-dbcedf5577e7.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-a971220e.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a971220e-d7f0-4919-9963-dbcedf5577e7.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-a971220e.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-e5080341-7377-4f3f-9427-388a105a91a7.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-e5080341.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-e5080341-7377-4f3f-9427-388a105a91a7.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/repos_github-api-test-org_ghcontentintegrationtest-e5080341.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json index 4dcbcc925..77527e6fa 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-e5080341-7377-4f3f-9427-388a105a91a7.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-e5080341.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:44 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json index c2639aed4..24f91ffee 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-3cdae02b-77ed-4fb7-96fa-fee8aab5e88d.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-50-3cdae02b.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:46 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json index ccd2974fa..6f8a25ab0 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a5a649cc-8b2b-4c58-ba06-8445261108f8.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-a5a649cc.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:48 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json index e1ea2c44d..2d80fb6a1 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json @@ -19,7 +19,7 @@ }, "response": { "status": 201, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-a971220e-d7f0-4919-9963-dbcedf5577e7.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-a971220e.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:45 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json index 592697c56..f547f0863 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5b2d0899-ece6-4a5f-a8dc-4b0f296b21a1.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-5b2d0899.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:46 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json index 83e6f3604..0305c121b 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4be43bcb-37e3-4c54-8b0a-c190690dc820.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-4be43bcb.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:46 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json index a1884b577..6bb6a8431 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-64a83a7d-a195-4f3b-989e-293e3f23611a.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-64a83a7d.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:46 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json index c4d1ce7b4..ef43d1f9b 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json @@ -19,7 +19,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-04f85e50-583c-48ad-8d45-55368c542148.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-04f85e50.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:47 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json index 4318de4bb..1253c5cc5 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-1d4297f8-515f-48b0-8f13-99894911d416.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-50_test-file-tocreate-1txt-1d4297f8.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:47 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-2d908c73-0706-4af1-86d4-005b3b91adba.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-2d908c73.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-2d908c73-0706-4af1-86d4-005b3b91adba.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-2d908c73.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json index 2d6d5314b..a9e111a8e 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-2d908c73-0706-4af1-86d4-005b3b91adba.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-2d908c73.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:39 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-462ae734-fe48-4be5-b432-ddd9912ca0e5.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-462ae734.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-462ae734-fe48-4be5-b432-ddd9912ca0e5.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-462ae734.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json index 2ee40a130..5cb1bf162 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-462ae734-fe48-4be5-b432-ddd9912ca0e5.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-462ae734.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:41 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-3e4aa25e-6949-43de-b9e8-bafb84e4b2a5.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-3e4aa25e.json similarity index 100% rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-3e4aa25e-6949-43de-b9e8-bafb84e4b2a5.json rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-3e4aa25e.json diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json index 1c9cf47f3..23c396733 100644 --- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json +++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-3e4aa25e-6949-43de-b9e8-bafb84e4b2a5.json", + "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-3e4aa25e.json", "headers": { "Date": "Tue, 26 Nov 2019 01:09:51 GMT", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/orgs_github-api-test-org-18671a38-8d77-4242-9519-3503350cf496.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/orgs_github-api-test-org-18671a38-8d77-4242-9519-3503350cf496.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/orgs_github-api-test-org-18671a38-8d77-4242-9519-3503350cf496.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/orgs_github-api-test-org-18671a38-8d77-4242-9519-3503350cf496.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api-dac6a9c8-632c-4fe0-8f83-a79f1c361f46.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api-dac6a9c8-632c-4fe0-8f83-a79f1c361f46.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api-dac6a9c8-632c-4fe0-8f83-a79f1c361f46.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api-dac6a9c8-632c-4fe0-8f83-a79f1c361f46.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api_git_refs-ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs-ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api_git_refs-ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs-ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api_git_refs-d5310eac-a58b-496e-9829-5bfb59231e49.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs-d5310eac.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api_git_refs-d5310eac-a58b-496e-9829-5bfb59231e49.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs-d5310eac.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-3964781d-6074-412b-bb7a-f3de1bd9ca9c.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-3964781d.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-3964781d-6074-412b-bb7a-f3de1bd9ca9c.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-3964781d.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-709410bf-7c2e-48fa-92a7-f493ffbe7262.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-709410bf.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-709410bf-7c2e-48fa-92a7-f493ffbe7262.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-709410bf.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-d47b333a-351b-499c-866b-11122bd52803.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-d47b333a.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-d47b333a-351b-499c-866b-11122bd52803.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-d47b333a.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/user-0e4fff19-acf2-4b5d-863e-ac84adf7a090.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-0e4fff19-acf2-4b5d-863e-ac84adf7a090.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/user-0e4fff19-acf2-4b5d-863e-ac84adf7a090.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-0e4fff19-acf2-4b5d-863e-ac84adf7a090.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/user-ba9eb87b-ec27-4a38-9faf-f238b715e9ac.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-ba9eb87b-ec27-4a38-9faf-f238b715e9ac.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/__files/user-ba9eb87b-ec27-4a38-9faf-f238b715e9ac.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-ba9eb87b-ec27-4a38-9faf-f238b715e9ac.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/orgs_github-api-test-org-3-18671a.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/orgs_github-api-test-org-3-18671a.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/orgs_github-api-test-org-3-18671a.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/orgs_github-api-test-org-3-18671a.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api-4-dac6a9.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api-4-dac6a9.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api-4-dac6a9.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api-4-dac6a9.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs-12-ae6bc9.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-12-ae6bc9.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs-12-ae6bc9.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-12-ae6bc9.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs-6-d5310e.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-6-d5310e.json similarity index 98% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs-6-d5310e.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-6-d5310e.json index d994a52ae..b9e10be7a 100644 --- a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs-6-d5310e.json +++ b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-6-d5310e.json @@ -19,7 +19,7 @@ }, "response": { "status": 201, - "bodyFileName": "repos_github-api-test-org_github-api_git_refs-d5310eac-a58b-496e-9829-5bfb59231e49.json", + "bodyFileName": "repos_github-api-test-org_github-api_git_refs-d5310eac.json", "headers": { "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-10-05226c.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-10-05226c.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-10-05226c.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-10-05226c.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-11-6e1f95.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-11-6e1f95.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-11-6e1f95.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-11-6e1f95.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-13-60a342.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-13-60a342.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-13-60a342.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-13-60a342.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14-709410.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14-709410.json similarity index 97% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14-709410.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14-709410.json index 844efde44..f32dd8052 100644 --- a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14-709410.json +++ b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14-709410.json @@ -18,7 +18,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-709410bf-7c2e-48fa-92a7-f493ffbe7262.json", + "bodyFileName": "repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-709410bf.json", "headers": { "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-15-eea55a.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-15-eea55a.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-15-eea55a.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-15-eea55a.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7-396478.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7-396478.json similarity index 97% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7-396478.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7-396478.json index da689134e..1c30ba73e 100644 --- a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7-396478.json +++ b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7-396478.json @@ -18,7 +18,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-3964781d-6074-412b-bb7a-f3de1bd9ca9c.json", + "bodyFileName": "repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-3964781d.json", "headers": { "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-8-4506da.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-8-4506da.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-8-4506da.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-8-4506da.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-9-fc958c.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-9-fc958c.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-9-fc958c.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-9-fc958c.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5-d47b33.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5-d47b33.json similarity index 96% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5-d47b33.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5-d47b33.json index 4fab8e2d3..84c188bbb 100644 --- a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5-d47b33.json +++ b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5-d47b33.json @@ -12,7 +12,7 @@ }, "response": { "status": 200, - "bodyFileName": "repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-d47b333a-351b-499c-866b-11122bd52803.json", + "bodyFileName": "repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-d47b333a.json", "headers": { "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}", "Content-Type": "application/json; charset=utf-8", diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/user-1-0e4fff.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-1-0e4fff.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/user-1-0e4fff.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-1-0e4fff.json diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/user-2-ba9eb8.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-2-ba9eb8.json similarity index 100% rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero_GitHubRef_Error/mappings/user-2-ba9eb8.json rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-2-ba9eb8.json