diff --git a/src/main/java/org/kohsuke/github/GHRateLimit.java b/src/main/java/org/kohsuke/github/GHRateLimit.java index 863a91fb68..a545001a45 100644 --- a/src/main/java/org/kohsuke/github/GHRateLimit.java +++ b/src/main/java/org/kohsuke/github/GHRateLimit.java @@ -73,8 +73,8 @@ public class GHRateLimit { * The calculated time at which the rate limit will reset. * Only calculated if {@link #getResetDate} is called. */ - @CheckForNull - private Date resetDate = null; + @Nonnull + private Date resetDate; /** * Gets a placeholder instance that can be used when we fail to get one from the server. @@ -96,24 +96,26 @@ public GHRateLimit(@JsonProperty("limit") int limit, this(limit, remaining, resetEpochSeconds, null); } + @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", + justification = "Deprecated") public GHRateLimit(int limit, int remaining, long resetEpochSeconds, String updatedAt) { this.limitCount = limit; this.remainingCount = remaining; this.resetEpochSeconds = resetEpochSeconds; - setUpdatedAt(updatedAt); + this.resetDate = recalculateResetDate(updatedAt); // Deprecated fields this.remaining = remaining; this.limit = limit; this.reset = new Date(resetEpochSeconds); - } /** * * @param updatedAt a string date in RFC 1123 + * @return reset date based on the passed date */ - void setUpdatedAt(String updatedAt) { + Date recalculateResetDate(String updatedAt) { long updatedAtEpochSeconds = createdAtEpochSeconds; if (!StringUtils.isBlank(updatedAt)) { try { @@ -126,10 +128,10 @@ void setUpdatedAt(String updatedAt) { } } - long calculatedSecondsUntilReset = resetEpochSeconds - updatedAtEpochSeconds; - // This may seem odd but it results in an accurate or slightly pessimistic reset date - resetDate = new Date((createdAtEpochSeconds + calculatedSecondsUntilReset) * 1000); + // based on system time rather than on the system being in sync with the server + long calculatedSecondsUntilReset = resetEpochSeconds - updatedAtEpochSeconds; + return resetDate = new Date((createdAtEpochSeconds + calculatedSecondsUntilReset) * 1000); } /** diff --git a/src/main/java/org/kohsuke/github/Requester.java b/src/main/java/org/kohsuke/github/Requester.java index 84ff24d757..167cf3e2d0 100644 --- a/src/main/java/org/kohsuke/github/Requester.java +++ b/src/main/java/org/kohsuke/github/Requester.java @@ -44,7 +44,15 @@ import java.net.SocketTimeoutException; import java.net.URL; import java.net.URLEncoder; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.NoSuchElementException; import java.util.function.Consumer; import java.util.logging.Logger; import java.util.regex.Matcher; @@ -702,7 +710,7 @@ private T setResponseHeaders(T readValue) { setResponseHeaders((GHObject) readValue); } else if (readValue instanceof JsonRateLimit) { // if we're getting a GHRateLimit it needs the server date - ((JsonRateLimit)readValue).rate.setUpdatedAt(uc.getHeaderField("Date")); + ((JsonRateLimit)readValue).rate.recalculateResetDate(uc.getHeaderField("Date")); } return readValue; } diff --git a/src/test/java/org/kohsuke/github/GitHubConnectionTest.java b/src/test/java/org/kohsuke/github/GitHubConnectionTest.java index 5db75f6506..0cd4f718c9 100644 --- a/src/test/java/org/kohsuke/github/GitHubConnectionTest.java +++ b/src/test/java/org/kohsuke/github/GitHubConnectionTest.java @@ -6,8 +6,6 @@ import java.lang.reflect.Field; import java.util.*; -import static org.hamcrest.CoreMatchers.*; - /** * Unit test for {@link GitHub}. */ @@ -97,233 +95,6 @@ public void testGithubBuilderWithAppInstallationToken() throws Exception{ assertEquals("",github.login); } - @Test - public void testGitHubRateLimit() throws Exception { - assertThat(mockGitHub.getRequestCount(), equalTo(0)); - GHRateLimit rateLimit = null; - GitHub hub = null; - Date lastReset = new Date(System.currentTimeMillis() / 1000L); - int lastRemaining = 5000; - - // Give this a moment - Thread.sleep(1000); - - // ------------------------------------------------------------- - // /user gets response with rate limit information - hub = getGitHubBuilder() - .withEndpoint(mockGitHub.apiServer().baseUrl()).build(); - hub.getMyself(); - - assertThat(mockGitHub.getRequestCount(), equalTo(1)); - - // Since we already had rate limit info these don't request again - rateLimit = hub.lastRateLimit(); - assertThat(rateLimit, notNullValue()); - assertThat(rateLimit.limit, equalTo(5000)); - lastRemaining = rateLimit.remaining; - // Because we're gettting this from old mocked info, it will be an older date - //assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(-1)); - lastReset = rateLimit.getResetDate(); - - GHRateLimit headerRateLimit = rateLimit; - - // Give this a moment - Thread.sleep(1000); - - // ratelimit() uses headerRateLimit if available - assertThat(hub.rateLimit(), equalTo(headerRateLimit)); - - assertThat(mockGitHub.getRequestCount(), equalTo(1)); - - // Give this a moment - Thread.sleep(1000); - - // Always requests new info - rateLimit = hub.getRateLimit(); - assertThat(mockGitHub.getRequestCount(), equalTo(2)); - - assertThat(rateLimit, notNullValue()); - assertThat(rateLimit.limit, equalTo(5000)); - // rate limit request is free - assertThat(rateLimit.remaining, equalTo(lastRemaining)); - assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(0)); - - // Give this a moment - Thread.sleep(1000); - - // Always requests new info - rateLimit = hub.getRateLimit(); - assertThat(mockGitHub.getRequestCount(), equalTo(3)); - - assertThat(rateLimit, notNullValue()); - assertThat(rateLimit.limit, equalTo(5000)); - // rate limit request is free - assertThat(rateLimit.remaining, equalTo(lastRemaining)); - assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(0)); - - - hub.getOrganization(GITHUB_API_TEST_ORG); - assertThat(mockGitHub.getRequestCount(), equalTo(4)); - - - assertThat(hub.lastRateLimit(), not(equalTo(headerRateLimit))); - rateLimit = hub.lastRateLimit(); - assertThat(rateLimit, notNullValue()); - assertThat(rateLimit.limit, equalTo(5000)); - // Org costs limit to query - assertThat(rateLimit.remaining, equalTo(lastRemaining - 1)); - assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(0)); - lastReset = rateLimit.getResetDate(); - headerRateLimit = rateLimit; - - // ratelimit() should prefer headerRateLimit when it is most recent - assertThat(hub.rateLimit(), equalTo(headerRateLimit)); - - assertThat(mockGitHub.getRequestCount(), equalTo(4)); - - // Always requests new info - rateLimit = hub.getRateLimit(); - assertThat(mockGitHub.getRequestCount(), equalTo(5)); - - assertThat(rateLimit, notNullValue()); - assertThat(rateLimit.limit, equalTo(5000)); - // Org costs limit to query - assertThat(rateLimit.remaining, equalTo(lastRemaining - 1)); - assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(0)); - - // ratelimit() should prefer headerRateLimit when getRateLimit() fails - // BUG: When getRateLimit() succeeds, it should reset the ratelimit() to the new value -// assertThat(hub.rateLimit(), equalTo(rateLimit)); -// assertThat(hub.rateLimit(), not(equalTo(headerRateLimit))); - assertThat(hub.rateLimit(), equalTo(headerRateLimit)); - - assertThat(mockGitHub.getRequestCount(), equalTo(5)); - } - - @Test - public void testGitHubEnterpriseDoesNotHaveRateLimit() throws Exception { - // Customized response that results in file not found the same as GitHub Enterprise - snapshotNotAllowed(); - assertThat(mockGitHub.getRequestCount(), equalTo(0)); - GHRateLimit rateLimit = null; - GitHub hub = null; - - - Date lastReset = new Date(System.currentTimeMillis() / 1000L); - - // Give this a moment - Thread.sleep(1000); - - // ------------------------------------------------------------- - // Before any queries, rate limit starts as null but may be requested - hub = GitHub.connectToEnterprise(mockGitHub.apiServer().baseUrl(), "bogus", "bogus"); - assertThat(mockGitHub.getRequestCount(), equalTo(0)); - - assertThat(hub.lastRateLimit(), nullValue()); - - rateLimit = hub.rateLimit(); - assertThat(rateLimit, notNullValue()); - assertThat(rateLimit.limit, equalTo(1000000)); - assertThat(rateLimit.remaining, equalTo(1000000)); - assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(1)); - lastReset = rateLimit.getResetDate(); - - assertThat(mockGitHub.getRequestCount(), equalTo(1)); - - // last is still null, because it actually means lastHeaderRateLimit - assertThat(hub.lastRateLimit(), nullValue()); - - assertThat(mockGitHub.getRequestCount(), equalTo(1)); - - // Give this a moment - Thread.sleep(1000); - - // ------------------------------------------------------------- - // First call to /user gets response without rate limit information - hub = GitHub.connectToEnterprise(mockGitHub.apiServer().baseUrl(), "bogus", "bogus"); - hub.getMyself(); - assertThat(mockGitHub.getRequestCount(), equalTo(2)); - - assertThat(hub.lastRateLimit(), nullValue()); - - rateLimit = hub.rateLimit(); - assertThat(rateLimit, notNullValue()); - assertThat(rateLimit.limit, equalTo(1000000)); - assertThat(rateLimit.remaining, equalTo(1000000)); - assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(1)); - lastReset = rateLimit.getResetDate(); - - assertThat(mockGitHub.getRequestCount(), equalTo(3)); - - // Give this a moment - Thread.sleep(1000); - - // Always requests new info - rateLimit = hub.getRateLimit(); - assertThat(mockGitHub.getRequestCount(), equalTo(4)); - - assertThat(rateLimit, notNullValue()); - assertThat(rateLimit.limit, equalTo(1000000)); - assertThat(rateLimit.remaining, equalTo(1000000)); - assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(1)); - - // Give this a moment - Thread.sleep(1000); - - - // last is still null, because it actually means lastHeaderRateLimit - assertThat(hub.lastRateLimit(), nullValue()); - - // ratelimit() tries not to make additional requests, uses queried rate limit since header not available - Thread.sleep(1000); - assertThat(hub.rateLimit(), equalTo(rateLimit)); - - // ------------------------------------------------------------- - // Second call to /user gets response with rate limit information - hub = GitHub.connectToEnterprise(mockGitHub.apiServer().baseUrl(), "bogus", "bogus"); - hub.getMyself(); - assertThat(mockGitHub.getRequestCount(), equalTo(5)); - - // Since we already had rate limit info these don't request again - rateLimit = hub.lastRateLimit(); - assertThat(rateLimit, notNullValue()); - assertThat(rateLimit.limit, equalTo(5000)); - assertThat(rateLimit.remaining, equalTo(4978)); - // Because we're gettting this from old mocked info, it will be an older date - assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(-1)); - lastReset = rateLimit.getResetDate(); - - GHRateLimit headerRateLimit = rateLimit; - - // Give this a moment - Thread.sleep(1000); - - // ratelimit() uses headerRateLimit if available - assertThat(hub.rateLimit(), equalTo(headerRateLimit)); - - assertThat(mockGitHub.getRequestCount(), equalTo(5)); - - // Give this a moment - Thread.sleep(1000); - - // Always requests new info - rateLimit = hub.getRateLimit(); - assertThat(mockGitHub.getRequestCount(), equalTo(6)); - - assertThat(rateLimit, notNullValue()); - assertThat(rateLimit.limit, equalTo(1000000)); - assertThat(rateLimit.remaining, equalTo(1000000)); - assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(1)); - - // Give this a moment - Thread.sleep(1000); - - // ratelimit() should prefer headerRateLimit when getRateLimit fails - assertThat(hub.rateLimit(), equalTo(headerRateLimit)); - - assertThat(mockGitHub.getRequestCount(), equalTo(6)); - } - @Test public void testGitHubIsApiUrlValid() throws IOException { GitHub hub = GitHub.connectAnonymously(); diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3-ec2931.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3-ec2931.json index 1f6737caba..07f2d8988f 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3-ec2931.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3-ec2931.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4969", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2-36588a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2-36588a.json index 6ffb0c6a47..f2c60d10ea 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2-36588a.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2-36588a.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4970", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "no-cache", "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo", "X-Accepted-OAuth-Scopes": "", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10-5432b2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10-5432b2.json index 7369bc5f11..15f70c0bf5 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10-5432b2.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10-5432b2.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4966", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-11-11-2e2a6e.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-11-11-2e2a6e.json index ecac014b94..fc63ff6ead 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-11-11-2e2a6e.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-11-11-2e2a6e.json @@ -18,7 +18,7 @@ "Status": "304 Not Modified", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4966", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-12-12-a9ae79.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-12-12-a9ae79.json index 1ad843af66..d1b4d43e15 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-12-12-a9ae79.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-12-12-a9ae79.json @@ -18,7 +18,7 @@ "Status": "304 Not Modified", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4966", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-13-13-b2221a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-13-13-b2221a.json index d5cdf22a5c..3743e2b497 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-13-13-b2221a.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-13-13-b2221a.json @@ -18,7 +18,7 @@ "Status": "304 Not Modified", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4966", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14-7e396e.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14-7e396e.json index 02c96fcb9f..72c8c71b8f 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14-7e396e.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14-7e396e.json @@ -20,7 +20,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4963", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-15-15-bc8d8b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-15-15-bc8d8b.json index 6dd2a15977..f244b05665 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-15-15-bc8d8b.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-15-15-bc8d8b.json @@ -18,7 +18,7 @@ "Status": "304 Not Modified", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4963", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-16-16-3857dc.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-16-16-3857dc.json index a18687c281..922de8f95a 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-16-16-3857dc.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-16-16-3857dc.json @@ -18,7 +18,7 @@ "Status": "304 Not Modified", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4963", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-17-17-4d123b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-17-17-4d123b.json index 49e0235004..5bd7176969 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-17-17-4d123b.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-17-17-4d123b.json @@ -18,7 +18,7 @@ "Status": "304 Not Modified", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4963", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4-b99f84.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4-b99f84.json index 8fea8fa13b..f9d23c8251 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4-b99f84.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4-b99f84.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4968", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-5-5-5e7b86.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-5-5-5e7b86.json index 2d95e4c8b9..d400a57e87 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-5-5-5e7b86.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-5-5-5e7b86.json @@ -18,7 +18,7 @@ "Status": "304 Not Modified", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4968", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-6-6-e20958.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-6-6-e20958.json index 1cb35daa7e..1c5e56b539 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-6-6-e20958.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-6-6-e20958.json @@ -18,7 +18,7 @@ "Status": "304 Not Modified", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4968", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-7-7-597005.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-7-7-597005.json index 4830f0a132..2ce13d2c51 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-7-7-597005.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-7-7-597005.json @@ -18,7 +18,7 @@ "Status": "304 Not Modified", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4968", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-8-8-441d13.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-8-8-441d13.json index 817466b7bf..4d4eb927af 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-8-8-441d13.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-8-8-441d13.json @@ -13,7 +13,7 @@ "Status": "304 Not Modified", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4968", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9-0db057.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9-0db057.json index 1807eb30c9..94e41139a1 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9-0db057.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9-0db057.json @@ -22,7 +22,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4967", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1-5dbb2b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1-5dbb2b.json index f3aede2877..2de6a224e3 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1-5dbb2b.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1-5dbb2b.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4970", - "X-RateLimit-Reset": "1569875630", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3-1d3815.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3-1d3815.json index 339fbf6348..f5189a4d9b 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3-1d3815.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3-1d3815.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4983", - "X-RateLimit-Reset": "1569872730", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2-b23929.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2-b23929.json index 45879bdab1..71e6bd4791 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2-b23929.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2-b23929.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4984", - "X-RateLimit-Reset": "1569872730", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "no-cache", "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo", "X-Accepted-OAuth-Scopes": "", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4-ec57e1.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4-ec57e1.json index 36ef6465fb..5717ff5970 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4-ec57e1.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4-ec57e1.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4982", - "X-RateLimit-Reset": "1569872730", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5-82db63.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5-82db63.json index 54af1a90bb..ea45c446ac 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5-82db63.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5-82db63.json @@ -22,7 +22,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4981", - "X-RateLimit-Reset": "1569872730", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6-02d53c.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6-02d53c.json index 368f1bd68c..f94c6c210a 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6-02d53c.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6-02d53c.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4980", - "X-RateLimit-Reset": "1569872730", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1-d95886.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1-d95886.json index fe8650d263..3f1f2a981f 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1-d95886.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1-d95886.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4984", - "X-RateLimit-Reset": "1569872730", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3-82590d.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3-82590d.json index 06a0126e75..bb80d4aaaa 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3-82590d.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3-82590d.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4994", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2-e76bb3.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2-e76bb3.json index 9e8977e212..2fa7be150e 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2-e76bb3.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2-e76bb3.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4995", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "no-cache", "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo", "X-Accepted-OAuth-Scopes": "", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10-d7826a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10-d7826a.json index 611730932b..bf7ce092b2 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10-d7826a.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10-d7826a.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4987", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11-144773.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11-144773.json index 4d563b8c97..d82af3faf0 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11-144773.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11-144773.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4986", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12-49fce6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12-49fce6.json index 91270e3ce0..b5f0dd01e3 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12-49fce6.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12-49fce6.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4985", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13-31849f.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13-31849f.json index c304cf21e9..36ec73fca9 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13-31849f.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13-31849f.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4984", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14-8a71a8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14-8a71a8.json index 8c46f65c56..a191d6e9cc 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14-8a71a8.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14-8a71a8.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4981", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15-e6a8cc.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15-e6a8cc.json index 85ab4310d8..12277b13dd 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15-e6a8cc.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15-e6a8cc.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4980", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16-1ec048.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16-1ec048.json index d3aa16206d..546ad809c2 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16-1ec048.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16-1ec048.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4979", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17-3e8ef8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17-3e8ef8.json index ac4b7ea0eb..e7b8c20ea4 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17-3e8ef8.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17-3e8ef8.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4978", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4-99fb84.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4-99fb84.json index 4696f564de..972b0b0eb1 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4-99fb84.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4-99fb84.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4993", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5-57466b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5-57466b.json index 16a69f3c80..a81675ba61 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5-57466b.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5-57466b.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4992", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6-766326.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6-766326.json index b21ebb471b..b9b2fe4b89 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6-766326.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6-766326.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4991", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7-720bd2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7-720bd2.json index 75c141a5ec..404ad47bd2 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7-720bd2.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7-720bd2.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4990", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8-50e14b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8-50e14b.json index f994f53133..12ade21c18 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8-50e14b.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8-50e14b.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4989", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9-703fd1.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9-703fd1.json index e7d51ba493..aca31b695f 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9-703fd1.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9-703fd1.json @@ -22,7 +22,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4988", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP", diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1-754481.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1-754481.json index 080eba4944..c983a164eb 100644 --- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1-754481.json +++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1-754481.json @@ -15,7 +15,7 @@ "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4995", - "X-RateLimit-Reset": "1569867392", + "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": [ "Accept, Authorization, Cookie, X-GitHub-OTP",